From: eshe Date: Fri, 28 May 2010 19:45:34 +0000 (+0100) Subject: Added about dialog and missing translations. Fixed repainting problen in detail view. X-Git-Url: http://git.maemo.org/git/?p=jenirok;a=commitdiff_plain;h=0b5c39a64431b662e3942a0b7cbeb1d59e57ddc1 Added about dialog and missing translations. Fixed repainting problen in detail view. --- diff --git a/Makefile b/Makefile index d117851..e40eaf1 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: jenirok -# Generated by qmake (2.01a) (Qt 4.6.2) on: Fri May 28 18:25:16 2010 +# Generated by qmake (2.01a) (Qt 4.6.2) on: Fri May 28 20:43:16 2010 # Project: jenirok.pro # Template: subdirs # Command: /usr/bin/qmake -unix -o Makefile jenirok.pro diff --git a/src/common/eniro.cpp b/src/common/eniro.cpp index 63dc421..90d2493 100644 --- a/src/common/eniro.cpp +++ b/src/common/eniro.cpp @@ -42,8 +42,8 @@ namespace "dk" }; - static const QString INVALID_LOGIN_STRING = "Invalid login details"; - static const QString TIMEOUT_STRING = "Request timed out"; + static const QString INVALID_LOGIN_STRING = QObject::tr("Invalid login details"); + static const QString TIMEOUT_STRING = QObject::tr("Request timed out"); static const QString PERSON_REGEXP = "(.*)(.*)"; static const QString YELLOW_REGEXP = "(.*)(.*)"; static const QString NUMBER_REGEXP = "
(.*)
"; diff --git a/src/common/translations/fi_FI.qm b/src/common/translations/fi_FI.qm index 5df0c8e..cd6dc7b 100644 Binary files a/src/common/translations/fi_FI.qm and b/src/common/translations/fi_FI.qm differ diff --git a/src/common/translations/fi_FI.ts b/src/common/translations/fi_FI.ts index b610970..b7d12f5 100644 --- a/src/common/translations/fi_FI.ts +++ b/src/common/translations/fi_FI.ts @@ -2,6 +2,14 @@ + AboutDialog + + + About + Tietoa + + + CallListener Searching... @@ -20,7 +28,7 @@ DetailWindow - + Add to contacts Lisää yhteistietoihin @@ -41,7 +49,7 @@ - + Name Nimi @@ -61,39 +69,39 @@ Puhelinnumero - + Unable make call Puhelun aloittaminen epäonnistui - + Add Lisää - + Contact was successfully added to contacts. Yhteystieto lisättiin onnistuneesti. - + Unable to open SMS application SMS-sovelluksen käynnistäminen epäonnistui - - - + + + Error Virhe - + Unable to add contact. Yhteystiedon lisääminen epäonnistui, - + Number was successfully copied to clipboard. Numero kopioitiin onnistuneesti leikepöydälle. @@ -107,13 +115,13 @@ - + Stop daemon Pysäytä - + Start daemon Käynnistä @@ -128,42 +136,60 @@ Asetukset - + + About + Tietoa + + + Daemon was successfully stopped. Palvelu pysäytettiin onnistuneesti. - + Unable to stop daemon. Palvelun pysäyttäminen ei onnistunut. - + Daemon was successfully started. Palvelu käynnistettiin onnistuneesti. - + Unable to start daemon. Palvelun käynnistäminen ei onnistunut. - + Error Virhe - + Info Info - + You need to set Eniro login details in settings before using this feature. Sinun täytyy asettaa Eniro-tunnus ja -salasana asetuksista ennen kuin voit käyttää tätä ominaisuutta. + QObject + + + Invalid login details + Virheellinen tunnus tai salasana + + + + Request timed out + Pyyntö aikakatkaistiin + + + ResultWindow @@ -261,47 +287,47 @@ Eniro-sivusto - + Finnish Suomi - + Swedish Ruotsi - + Danish Tanska - + Autostart Käynnistä automaattisesti - + Enabled Kyllä - + Disabled Ei - + Save Tallenna - + Restarting daemon... Käynnistetään palvelu uudelleen... - + %n number(s) were deleted from cache Poistettiin %n numero välimuistista diff --git a/src/daemon/Makefile b/src/daemon/Makefile index 6ad019f..9382160 100644 --- a/src/daemon/Makefile +++ b/src/daemon/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: jenirokd -# Generated by qmake (2.01a) (Qt 4.6.2) on: Fri May 28 18:25:43 2010 +# Generated by qmake (2.01a) (Qt 4.6.2) on: Fri May 28 20:43:40 2010 # Project: daemon.pro # Template: app # Command: /usr/bin/qmake -unix -o Makefile daemon.pro diff --git a/src/gui/Makefile b/src/gui/Makefile index ce95e99..261cd8c 100644 --- a/src/gui/Makefile +++ b/src/gui/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: jenirok -# Generated by qmake (2.01a) (Qt 4.6.2) on: Fri May 28 18:25:18 2010 +# Generated by qmake (2.01a) (Qt 4.6.2) on: Fri May 28 20:43:25 2010 # Project: gui.pro # Template: app # Command: /usr/bin/qmake -unix -o Makefile gui.pro @@ -49,6 +49,7 @@ SOURCES = main.cpp \ resultwindow.cpp \ detailwindow.cpp \ settingsdialog.cpp \ + aboutdialog.cpp \ buttonselector.cpp \ daemon.cpp \ ../common/eniro.cpp \ @@ -61,6 +62,7 @@ SOURCES = main.cpp \ moc_resultwindow.cpp \ moc_detailwindow.cpp \ moc_settingsdialog.cpp \ + moc_aboutdialog.cpp \ moc_eniro.cpp \ moc_connectionmanager.cpp \ qrc_icons.cpp \ @@ -71,6 +73,7 @@ OBJECTS = main.o \ resultwindow.o \ detailwindow.o \ settingsdialog.o \ + aboutdialog.o \ buttonselector.o \ daemon.o \ eniro.o \ @@ -84,6 +87,7 @@ OBJECTS = main.o \ moc_resultwindow.o \ moc_detailwindow.o \ moc_settingsdialog.o \ + moc_aboutdialog.o \ moc_eniro.o \ moc_connectionmanager.o \ qrc_icons.o \ @@ -200,7 +204,7 @@ qmake: FORCE dist: @$(CHK_DIR_EXISTS) .tmp/jenirok1.0.0 || $(MKDIR) .tmp/jenirok1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/jenirok1.0.0/ && $(COPY_FILE) --parents mainwindow.h searchdialog.h resultwindow.h detailwindow.h settingsdialog.h buttonselector.h daemon.h ../common/eniro.h ../common/contactmanager.h ../common/db.h ../common/settings.h ../common/connectionmanager.h ../common/cache.h .tmp/jenirok1.0.0/ && $(COPY_FILE) --parents icons.grc ../common/translations.grc .tmp/jenirok1.0.0/ && $(COPY_FILE) --parents main.cpp mainwindow.cpp searchdialog.cpp resultwindow.cpp detailwindow.cpp settingsdialog.cpp buttonselector.cpp daemon.cpp ../common/eniro.cpp ../common/contactmanager.cpp ../common/db.cpp ../common/settings.cpp ../common/connectionmanager.cpp ../common/cache.cpp .tmp/jenirok1.0.0/ && $(COPY_FILE) --parents ../common/translations/fi_FI.ts .tmp/jenirok1.0.0/ && (cd `dirname .tmp/jenirok1.0.0` && $(TAR) jenirok1.0.0.tar jenirok1.0.0 && $(COMPRESS) jenirok1.0.0.tar) && $(MOVE) `dirname .tmp/jenirok1.0.0`/jenirok1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/jenirok1.0.0 + $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/jenirok1.0.0/ && $(COPY_FILE) --parents mainwindow.h searchdialog.h resultwindow.h detailwindow.h settingsdialog.h aboutdialog.h buttonselector.h daemon.h ../common/eniro.h ../common/contactmanager.h ../common/db.h ../common/settings.h ../common/connectionmanager.h ../common/cache.h .tmp/jenirok1.0.0/ && $(COPY_FILE) --parents icons.grc ../common/translations.grc .tmp/jenirok1.0.0/ && $(COPY_FILE) --parents main.cpp mainwindow.cpp searchdialog.cpp resultwindow.cpp detailwindow.cpp settingsdialog.cpp aboutdialog.cpp buttonselector.cpp daemon.cpp ../common/eniro.cpp ../common/contactmanager.cpp ../common/db.cpp ../common/settings.cpp ../common/connectionmanager.cpp ../common/cache.cpp .tmp/jenirok1.0.0/ && $(COPY_FILE) --parents ../common/translations/fi_FI.ts .tmp/jenirok1.0.0/ && (cd `dirname .tmp/jenirok1.0.0` && $(TAR) jenirok1.0.0.tar jenirok1.0.0 && $(COMPRESS) jenirok1.0.0.tar) && $(MOVE) `dirname .tmp/jenirok1.0.0`/jenirok1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/jenirok1.0.0 clean:compiler_clean @@ -219,12 +223,13 @@ mocclean: compiler_moc_header_clean compiler_moc_source_clean mocables: compiler_moc_header_make_all compiler_moc_source_make_all -compiler_moc_header_make_all: moc_mainwindow.cpp moc_searchdialog.cpp moc_resultwindow.cpp moc_detailwindow.cpp moc_settingsdialog.cpp moc_eniro.cpp moc_connectionmanager.cpp +compiler_moc_header_make_all: moc_mainwindow.cpp moc_searchdialog.cpp moc_resultwindow.cpp moc_detailwindow.cpp moc_settingsdialog.cpp moc_aboutdialog.cpp moc_eniro.cpp moc_connectionmanager.cpp compiler_moc_header_clean: - -$(DEL_FILE) moc_mainwindow.cpp moc_searchdialog.cpp moc_resultwindow.cpp moc_detailwindow.cpp moc_settingsdialog.cpp moc_eniro.cpp moc_connectionmanager.cpp + -$(DEL_FILE) moc_mainwindow.cpp moc_searchdialog.cpp moc_resultwindow.cpp moc_detailwindow.cpp moc_settingsdialog.cpp moc_aboutdialog.cpp moc_eniro.cpp moc_connectionmanager.cpp moc_mainwindow.cpp: searchdialog.h \ buttonselector.h \ settingsdialog.h \ + aboutdialog.h \ mainwindow.h /usr/bin/moc $(DEFINES) $(INCPATH) mainwindow.h -o moc_mainwindow.cpp @@ -246,6 +251,9 @@ moc_settingsdialog.cpp: buttonselector.h \ settingsdialog.h /usr/bin/moc $(DEFINES) $(INCPATH) settingsdialog.h -o moc_settingsdialog.cpp +moc_aboutdialog.cpp: aboutdialog.h + /usr/bin/moc $(DEFINES) $(INCPATH) aboutdialog.h -o moc_aboutdialog.cpp + moc_eniro.cpp: ../common/eniro.h /usr/bin/moc $(DEFINES) $(INCPATH) ../common/eniro.h -o moc_eniro.cpp @@ -257,7 +265,8 @@ compiler_rcc_clean: -$(DEL_FILE) qrc_icons.cpp qrc_translations.cpp qrc_icons.cpp: icons.grc \ icons/stop.png \ - icons/start.png + icons/start.png \ + icons/icon.png /usr/bin/rcc -name icons icons.grc -o qrc_icons.cpp qrc_translations.cpp: ../common/translations.grc \ @@ -285,6 +294,7 @@ main.o: main.cpp mainwindow.h \ searchdialog.h \ buttonselector.h \ settingsdialog.h \ + aboutdialog.h \ resultwindow.h \ detailwindow.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp @@ -293,6 +303,7 @@ mainwindow.o: mainwindow.cpp mainwindow.h \ searchdialog.h \ buttonselector.h \ settingsdialog.h \ + aboutdialog.h \ daemon.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o mainwindow.cpp @@ -315,6 +326,9 @@ settingsdialog.o: settingsdialog.cpp settingsdialog.h \ daemon.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o settingsdialog.o settingsdialog.cpp +aboutdialog.o: aboutdialog.cpp aboutdialog.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o aboutdialog.o aboutdialog.cpp + buttonselector.o: buttonselector.cpp buttonselector.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o buttonselector.o buttonselector.cpp @@ -358,6 +372,9 @@ moc_detailwindow.o: moc_detailwindow.cpp moc_settingsdialog.o: moc_settingsdialog.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_settingsdialog.o moc_settingsdialog.cpp +moc_aboutdialog.o: moc_aboutdialog.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_aboutdialog.o moc_aboutdialog.cpp + moc_eniro.o: moc_eniro.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_eniro.o moc_eniro.cpp diff --git a/src/gui/aboutdialog.cpp b/src/gui/aboutdialog.cpp new file mode 100644 index 0000000..e7eb716 --- /dev/null +++ b/src/gui/aboutdialog.cpp @@ -0,0 +1,39 @@ +/* + * This file is part of Jenirok. + * + * Jenirok is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Jenirok is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Jenirok. If not, see . + * + */ + +#include +#include +#include +#include +#include "aboutdialog.h" + +AboutDialog::AboutDialog(QWidget* parent): QDialog(parent) +{ + setWindowTitle(tr("About")); + + QHBoxLayout* mainLayout = new QHBoxLayout(); + QPixmap pixmap(":/icons/icon.png"); + QLabel* image = new QLabel; + image->setPixmap(pixmap); + mainLayout->addWidget(image, 0, Qt::AlignLeft); + mainLayout->addSpacing(20); + QLabel* text = new QLabel("Jenirok
(c) 2010 Jesse Hakanen
http://jenirok.garage.maemo.org"); + mainLayout->addWidget(text, 10, Qt::AlignLeft); + + setLayout(mainLayout); +} diff --git a/src/gui/aboutdialog.h b/src/gui/aboutdialog.h new file mode 100644 index 0000000..fcc677f --- /dev/null +++ b/src/gui/aboutdialog.h @@ -0,0 +1,38 @@ +/* + * This file is part of Jenirok. + * + * Jenirok is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Jenirok is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Jenirok. If not, see . + * + */ + +#ifndef ABOUTDIALOG_H +#define ABOUTDIALOG_H + +#include +#include + + +class AboutDialog : public QDialog +{ + Q_OBJECT + +public: + + AboutDialog(QWidget* parent = 0); + +private: + +}; + +#endif diff --git a/src/gui/detailwindow.cpp b/src/gui/detailwindow.cpp index 8dc4349..23a591f 100644 --- a/src/gui/detailwindow.cpp +++ b/src/gui/detailwindow.cpp @@ -32,7 +32,7 @@ DetailWindow::DetailWindow(QWidget* parent): QMainWindow(parent), addDialog_(0) { setAttribute(Qt::WA_Maemo5StackedWindow); - area_ = new QScrollArea(this); + area_ = new QWidget(this); layout_ = new QVBoxLayout; QHBoxLayout* top = new QHBoxLayout; QHBoxLayout* bottom = new QHBoxLayout; @@ -81,7 +81,6 @@ void DetailWindow::loadData(Eniro::Result const& details) streetButton_->setValueText(details.street); cityButton_->setValueText(details.city); numberButton_->setValueText(details.number); - layout_->update(); show(); } diff --git a/src/gui/detailwindow.h b/src/gui/detailwindow.h index ff6b87a..73f8232 100644 --- a/src/gui/detailwindow.h +++ b/src/gui/detailwindow.h @@ -21,9 +21,9 @@ #include #include -#include #include #include +#include #include #include "searchdialog.h" #include "eniro.h" @@ -46,7 +46,7 @@ private slots: void sendSMS(); private: - QScrollArea* area_; + QWidget* area_; QVBoxLayout* layout_; QMaemo5ValueButton* nameButton_; QMaemo5ValueButton* streetButton_; diff --git a/src/gui/gui.pro b/src/gui/gui.pro index cd5c6b3..c0ea702 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -1,8 +1,8 @@ QT += network sql maemo5 TARGET = jenirok TEMPLATE = app -SOURCES += main.cpp mainwindow.cpp searchdialog.cpp resultwindow.cpp detailwindow.cpp settingsdialog.cpp buttonselector.cpp daemon.cpp ../common/eniro.cpp ../common/contactmanager.cpp ../common/db.cpp ../common/settings.cpp ../common/connectionmanager.cpp ../common/cache.cpp -HEADERS += mainwindow.h searchdialog.h resultwindow.h detailwindow.h settingsdialog.h buttonselector.h daemon.h ../common/eniro.h ../common/contactmanager.h ../common/db.h ../common/settings.h ../common/connectionmanager.h ../common/cache.h +SOURCES += main.cpp mainwindow.cpp searchdialog.cpp resultwindow.cpp detailwindow.cpp settingsdialog.cpp aboutdialog.cpp buttonselector.cpp daemon.cpp ../common/eniro.cpp ../common/contactmanager.cpp ../common/db.cpp ../common/settings.cpp ../common/connectionmanager.cpp ../common/cache.cpp +HEADERS += mainwindow.h searchdialog.h resultwindow.h detailwindow.h settingsdialog.h aboutdialog.h buttonselector.h daemon.h ../common/eniro.h ../common/contactmanager.h ../common/db.h ../common/settings.h ../common/connectionmanager.h ../common/cache.h TRANSLATIONS = ../common/translations/fi_FI.ts RESOURCES = icons.grc ../common/translations.grc INCLUDEPATH += ../common diff --git a/src/gui/icons.grc b/src/gui/icons.grc index 4ac0e8f..68f3e89 100644 --- a/src/gui/icons.grc +++ b/src/gui/icons.grc @@ -2,5 +2,6 @@ icons/start.png icons/stop.png + icons/icon.png diff --git a/src/gui/icons/icon.png b/src/gui/icons/icon.png new file mode 100644 index 0000000..4f40c0c Binary files /dev/null and b/src/gui/icons/icon.png differ diff --git a/src/gui/icons/start.png b/src/gui/icons/start.png old mode 100755 new mode 100644 diff --git a/src/gui/icons/stop.png b/src/gui/icons/stop.png old mode 100755 new mode 100644 diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index cec7517..9b0f459 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -39,7 +39,7 @@ namespace MainWindow::MainWindow(QWidget* parent): QMainWindow(parent), searchResults_(0), settingsDialog_(0), running_(false), -toggleButton_(0), searchDialog_(0) +toggleButton_(0), searchDialog_(0), aboutDialog_(0) { setWindowTitle(tr("Jenirok")); setAttribute(Qt::WA_Maemo5StackedWindow); @@ -76,6 +76,7 @@ toggleButton_(0), searchDialog_(0) setCentralWidget(mainWidget); menuBar()->addAction(tr("Settings"), this, SLOT(showSettings())); + menuBar()->addAction(tr("About"), this, SLOT(showAbout())); } MainWindow::~MainWindow() @@ -165,3 +166,14 @@ void MainWindow::handleSearch(SearchDialog::SearchDetails& details) { emit search(details); } + +void MainWindow::showAbout() +{ + if(!aboutDialog_) + { + aboutDialog_ = new AboutDialog(this); + } + + aboutDialog_->show(); + +} diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h index fc7f12e..43d71b7 100644 --- a/src/gui/mainwindow.h +++ b/src/gui/mainwindow.h @@ -25,6 +25,7 @@ #include #include "searchdialog.h" #include "settingsdialog.h" +#include "aboutdialog.h" class MainWindow : public QMainWindow { @@ -39,6 +40,7 @@ signals: public slots: void showSettings(); + void showAbout(); void toggleDaemon(); void openSearch(); void handleSearch(SearchDialog::SearchDetails& details); @@ -50,6 +52,7 @@ private: bool running_; QToolButton* toggleButton_; SearchDialog* searchDialog_; + AboutDialog* aboutDialog_; }; diff --git a/src/gui/searchdialog.cpp b/src/gui/searchdialog.cpp index 16636c1..702075c 100644 --- a/src/gui/searchdialog.cpp +++ b/src/gui/searchdialog.cpp @@ -79,3 +79,9 @@ void SearchDialog::searchPressed() emit search(details); hide(); } + +void SearchDialog::setVisible(bool visible) +{ + QDialog::setVisible(visible); + numberInput_->setFocus(); +} diff --git a/src/gui/searchdialog.h b/src/gui/searchdialog.h index 3364c1a..193ee83 100644 --- a/src/gui/searchdialog.h +++ b/src/gui/searchdialog.h @@ -40,6 +40,7 @@ public: }; SearchDialog(QWidget* parent = 0); + virtual void setVisible(bool visible); signals: void search(SearchDialog::SearchDetails& details);