From 569effaa3ef7df71616e2fae9b1e89c5292f4c48 Mon Sep 17 00:00:00 2001 From: Bartosz Szatkowski Date: Wed, 18 Aug 2010 12:18:27 +0200 Subject: [PATCH] Added "about" dialog --- trunk/src/base/base.pro | 102 +++++++++++++++---------------------- trunk/src/base/gui/MainWindow.cpp | 11 +++- trunk/src/base/gui/MainWindow.h | 4 +- trunk/src/base/gui/gui.qrc | 1 + 4 files changed, 56 insertions(+), 62 deletions(-) diff --git a/trunk/src/base/base.pro b/trunk/src/base/base.pro index 4c6b86e..edfdf26 100644 --- a/trunk/src/base/base.pro +++ b/trunk/src/base/base.pro @@ -1,28 +1,17 @@ -#------------------------------------------------- -# +# ------------------------------------------------- # Project created by QtCreator 2010-08-03T08:54:27 -# -#------------------------------------------------- - -QT += core gui sql - -maemo5 { - QT += maemo5 -} - +# ------------------------------------------------- +QT += core \ + gui \ + sql +maemo5:QT += maemo5 TARGET = mdictionary TEMPLATE = app - MDICT_BINDIR = $$[MDICT_BINDIR] - -isEmpty(MDICT_BINDIR) { - MDICT_BINDIR = . -} - +isEmpty(MDICT_BINDIR):MDICT_BINDIR = . DESTDIR = $${MDICT_BINDIR} - -SOURCES += gui/main.cpp\ - gui/MainWindow.cpp \ +SOURCES += gui/main.cpp \ + gui/MainWindow.cpp \ gui/SearchBarWidget.cpp \ gui/WordListWidget.cpp \ gui/TranslationWidget.cpp \ @@ -35,9 +24,9 @@ SOURCES += gui/main.cpp\ gui/HistoryListDialog.cpp \ gui/WordListProxyStyle.cpp \ backbone/Bookmarks.cpp \ - gui/SettingsWidget.cpp - -HEADERS += gui/MainWindow.h \ + gui/SettingsWidget.cpp \ + gui/AboutWidget.cpp +HEADERS += gui/MainWindow.h \ gui/SearchBarWidget.h \ gui/WordListWidget.h \ gui/TranslationWidget.h \ @@ -56,41 +45,34 @@ HEADERS += gui/MainWindow.h \ gui/WordListProxyStyle.h \ backbone/Bookmarks.h \ backbone/BookmarkTranslations.h \ - gui/SettingsWidget.h - -FORMS += gui/MainWindow.ui - -unix { - #VARIABLES - isEmpty(PREFIX) { - PREFIX = /usr - } - BINDIR = $$PREFIX/bin - DATADIR =$$PREFIX/share - - DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\" - - #MAKE INSTALL - - INSTALLS += target desktop icon64 configs - - configs.path = ~/.mdictionary - configs.files += ../../../data/mdictionary.defaults - - target.path =$$BINDIR - -maemo5 { - desktop.path = $$DATADIR/applications/hildon - icon64.path = $$DATADIR/icons/hicolor/64x64/hildon -} - -!maemo5 { - desktop.path = $$DATADIR/applications - icon64.path = $$DATADIR/icons -} - desktop.files += ../../../data/other/$${TARGET}.desktop - icon64.files += ../../../data/icons/64x64/$${TARGET}.png + gui/SettingsWidget.h \ + gui/AboutWidget.h +FORMS += gui/MainWindow.ui +unix { + # VARIABLES + isEmpty(PREFIX):PREFIX = /usr + BINDIR = $$PREFIX/bin + DATADIR = $$PREFIX/share + DEFINES += DATADIR=\\\"$$DATADIR\\\" \ + PKGDATADIR=\\\"$$PKGDATADIR\\\" + + # MAKE INSTALL + INSTALLS += target \ + desktop \ + icon64 \ + configs + configs.path = ~/.mdictionary + configs.files += ../../../data/mdictionary.defaults + target.path = $$BINDIR + maemo5 { + desktop.path = $$DATADIR/applications/hildon + icon64.path = $$DATADIR/icons/hicolor/64x64/hildon + } + !maemo5 { + desktop.path = $$DATADIR/applications + icon64.path = $$DATADIR/icons + } + desktop.files += ../../../data/other/$${TARGET}.desktop + icon64.files += ../../../data/icons/64x64/$${TARGET}.png } - -RESOURCES += \ - gui/gui.qrc +RESOURCES += gui/gui.qrc diff --git a/trunk/src/base/gui/MainWindow.cpp b/trunk/src/base/gui/MainWindow.cpp index b7622ce..30b049b 100644 --- a/trunk/src/base/gui/MainWindow.cpp +++ b/trunk/src/base/gui/MainWindow.cpp @@ -94,11 +94,16 @@ void MainWindow::initializeUI() { settingsWidget = new SettingsWidget(this); settingsWidget->hide(); + aboutWidget = new AboutWidget(this); + aboutWidget->hide(); + + + #ifdef Q_WS_MAEMO_5 menuWidget = new MenuWidget(this); menuWidget->addSubMenu(tr("Settings"), settingsWidget); menuWidget->addSubMenu(tr("Dictionaries"), dictManagerWidget); - menuWidget->addSubMenu(tr("About"), new QPushButton("About")); + menuWidget->addSubMenu(tr("About"), aboutWidget); ui->menuBar->addAction(menuWidget); #else dictionariesAction = ui->menuBar->addAction(tr("Dictionaries")); @@ -108,6 +113,10 @@ void MainWindow::initializeUI() { settingsAction = ui->menuBar->addAction(tr("Settings")); connect(settingsAction, SIGNAL(triggered()), settingsWidget, SLOT(show())); + + aboutAction = ui->menuBar->addAction(tr("About")); + connect(aboutAction, SIGNAL(triggered()), + aboutWidget, SLOT(show())); #endif } diff --git a/trunk/src/base/gui/MainWindow.h b/trunk/src/base/gui/MainWindow.h index 0af6159..5f0c987 100644 --- a/trunk/src/base/gui/MainWindow.h +++ b/trunk/src/base/gui/MainWindow.h @@ -36,6 +36,7 @@ #include "DictManagerWidget.h" #include "SettingsWidget.h" #include "HistoryListDialog.h" +#include "AboutWidget.h" namespace Ui { class MainWindow; @@ -191,13 +192,14 @@ private: MenuWidget* menuWidget; DictManagerWidget* dictManagerWidget; SettingsWidget* settingsWidget; + AboutWidget* aboutWidget; #ifndef Q_WS_MAEMO_5 QSplitter* splitter; QAction* dictionariesAction; //QAction* edit; QAction* settingsAction; - //QAction* aboutAction; + QAction* aboutAction; #endif bool _exactSearch; diff --git a/trunk/src/base/gui/gui.qrc b/trunk/src/base/gui/gui.qrc index 0bd0ca2..dc740a5 100644 --- a/trunk/src/base/gui/gui.qrc +++ b/trunk/src/base/gui/gui.qrc @@ -2,5 +2,6 @@ staroff.png staron.png + mdictionary.png -- 1.7.9.5