From: Enar Väikene Date: Tue, 29 Nov 2011 13:08:04 +0000 (+0200) Subject: Changed to use the Gui::Window class instead of QWidget. X-Git-Url: https://vaikene.ee/gitweb/pswgen08.html?a=commitdiff_plain;h=25d800db07942aadab4140a4ed05196e7f4dcd12;p=evaf Changed to use the Gui::Window class instead of QWidget. --- diff --git a/src/apps/FileFinder/GUI/CMakeLists.txt b/src/apps/FileFinder/GUI/CMakeLists.txt index a29d09f..cdc585f 100644 --- a/src/apps/FileFinder/GUI/CMakeLists.txt +++ b/src/apps/FileFinder/GUI/CMakeLists.txt @@ -8,7 +8,7 @@ include(${QT_USE_FILE}) include_directories(${eVaf_INCLUDE}) # Required eVaf libraries -set(eVaf_LIBRARIES CommonLib PluginsLib) +set(eVaf_LIBRARIES CommonLib PluginsLib GuiLib) # Source files set(SRCS diff --git a/src/apps/FileFinder/GUI/gui.cpp b/src/apps/FileFinder/GUI/gui.cpp index 29dcd71..260b6c8 100644 --- a/src/apps/FileFinder/GUI/gui.cpp +++ b/src/apps/FileFinder/GUI/gui.cpp @@ -118,7 +118,7 @@ bool FileFinder::GUI::Module::init(QString const & args) // Create the main widget for this window wMain = new Internal::MainWidget; connect(wMain, SIGNAL(quit()), qApp, SLOT(quit())); - win->addWidget(wMain); + win->addWindow(wMain); // Create actions for the window and widgets on it createActions(); diff --git a/src/apps/FileFinder/GUI/gui.h b/src/apps/FileFinder/GUI/gui.h index e4c0c8e..02f4f22 100644 --- a/src/apps/FileFinder/GUI/gui.h +++ b/src/apps/FileFinder/GUI/gui.h @@ -21,6 +21,7 @@ # define __FILEFINDER_GUI_GUI_H #include +#include #include #include @@ -48,14 +49,14 @@ namespace Internal { /** * Main widget for the FileFinder window */ -class MainWidget : public QWidget +class MainWidget : public Gui::Window { Q_OBJECT public: MainWidget(QWidget * parent = 0) - : QWidget(parent) + : Gui::Window(parent) {} virtual void keyPressEvent(QKeyEvent * e); diff --git a/src/apps/FileFinder/GUI/version.h b/src/apps/FileFinder/GUI/version.h index dd5c198..733a6f5 100644 --- a/src/apps/FileFinder/GUI/version.h +++ b/src/apps/FileFinder/GUI/version.h @@ -25,12 +25,12 @@ /** * Module/library version number in the form major,minor,release,build */ -#define VER_FILE_VERSION 0,1,2,2 +#define VER_FILE_VERSION 0,1,3,3 /** * Module/library version number in the string format (shall end with \0) */ -#define VER_FILE_VERSION_STR "0.1.2.2\0" +#define VER_FILE_VERSION_STR "0.1.3.3\0" /** * Module/library name (shall end with \0) diff --git a/src/apps/PswGen/GUI/CMakeLists.txt b/src/apps/PswGen/GUI/CMakeLists.txt index 329cd17..bea3cd6 100644 --- a/src/apps/PswGen/GUI/CMakeLists.txt +++ b/src/apps/PswGen/GUI/CMakeLists.txt @@ -8,7 +8,7 @@ include(${QT_USE_FILE}) include_directories(${eVaf_INCLUDE}) # Required eVaf libraries -set(eVaf_LIBRARIES CommonLib PluginsLib) +set(eVaf_LIBRARIES CommonLib PluginsLib GuiLib) # Source files set(SRCS diff --git a/src/apps/PswGen/GUI/gui.cpp b/src/apps/PswGen/GUI/gui.cpp index 23a3c88..706522b 100644 --- a/src/apps/PswGen/GUI/gui.cpp +++ b/src/apps/PswGen/GUI/gui.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include @@ -74,8 +75,8 @@ bool Module::init(QString const & args) SdiWindow::iSdiWindow * win = evafQueryInterface("iSdiWindow"); EVAF_TEST_X(win, "No iSdiWindow interface"); - QWidget * masterWidget = new QWidget; - win->addWidget(masterWidget); + Gui::Window * masterWidget = new Gui::Window; + win->addWindow(masterWidget); QVBoxLayout * v = new QVBoxLayout; masterWidget->setLayout(v); diff --git a/src/apps/PswGen/GUI/version.h b/src/apps/PswGen/GUI/version.h index c4fbd22..8d9aad3 100644 --- a/src/apps/PswGen/GUI/version.h +++ b/src/apps/PswGen/GUI/version.h @@ -25,12 +25,12 @@ /** * Module/library version number in the form major,minor,release,build */ -#define VER_FILE_VERSION 0,1,3,4 +#define VER_FILE_VERSION 0,1,4,5 /** * Module/library version number in the string format (shall end with \0) */ -#define VER_FILE_VERSION_STR "0.1.3.4\0" +#define VER_FILE_VERSION_STR "0.1.4.5\0" /** * Module/library name (shall end with \0)