From: Enar Väikene Date: Thu, 1 Dec 2011 14:20:49 +0000 (+0200) Subject: Changed to use Gui::Panel instead of Gui::Window. X-Git-Url: https://vaikene.ee/gitweb/pswgen11.html?a=commitdiff_plain;h=388264abc0442ea0e4c6dca6812cb755053c79d5;p=evaf Changed to use Gui::Panel instead of Gui::Window. --- diff --git a/src/apps/FileFinder/GUI/gui.cpp b/src/apps/FileFinder/GUI/gui.cpp index 260b6c8..d1f1c4b 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->addWindow(wMain); + win->addPanel("FileFinder", 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 02f4f22..c8d3633 100644 --- a/src/apps/FileFinder/GUI/gui.h +++ b/src/apps/FileFinder/GUI/gui.h @@ -21,7 +21,7 @@ # define __FILEFINDER_GUI_GUI_H #include -#include +#include #include #include @@ -49,14 +49,14 @@ namespace Internal { /** * Main widget for the FileFinder window */ -class MainWidget : public Gui::Window +class MainWidget : public Gui::Panel { Q_OBJECT public: MainWidget(QWidget * parent = 0) - : Gui::Window(parent) + : Gui::Panel(parent) {} virtual void keyPressEvent(QKeyEvent * e); diff --git a/src/apps/FileFinder/GUI/version.h b/src/apps/FileFinder/GUI/version.h index 733a6f5..481c3f1 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,3,3 +#define VER_FILE_VERSION 0,1,4,4 /** * Module/library version number in the string format (shall end with \0) */ -#define VER_FILE_VERSION_STR "0.1.3.3\0" +#define VER_FILE_VERSION_STR "0.1.4.4\0" /** * Module/library name (shall end with \0) diff --git a/src/apps/PswGen/GUI/gui.cpp b/src/apps/PswGen/GUI/gui.cpp index 706522b..1ced109 100644 --- a/src/apps/PswGen/GUI/gui.cpp +++ b/src/apps/PswGen/GUI/gui.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include @@ -75,11 +75,11 @@ bool Module::init(QString const & args) SdiWindow::iSdiWindow * win = evafQueryInterface("iSdiWindow"); EVAF_TEST_X(win, "No iSdiWindow interface"); - Gui::Window * masterWidget = new Gui::Window; - win->addWindow(masterWidget); + Gui::Panel * panel = new Gui::Panel; + win->addPanel("PswGen", panel); QVBoxLayout * v = new QVBoxLayout; - masterWidget->setLayout(v); + panel->setLayout(v); QGridLayout * g = new QGridLayout; v->addLayout(g); @@ -109,7 +109,7 @@ bool Module::init(QString const & args) } connect(wName, SIGNAL(textChanged(QString)), this, SLOT(textChanged(QString))); g->addWidget(wName, 1, 1, 1, 2); - masterWidget->setFocusProxy(wName); + panel->setFocusProxy(wName); l = new QLabel(tr("&Length of the password:", VER_MODULE_NAME_STR)); l->setAlignment(Qt::AlignRight); @@ -147,15 +147,15 @@ bool Module::init(QString const & args) connect(wCopy, SIGNAL(clicked()), this, SLOT(copyClicked())); h->addWidget(wCopy); - QAction * a = new QAction(masterWidget); + QAction * a = new QAction(panel); a->setShortcut(Qt::Key_Return); connect(a, SIGNAL(triggered()), this, SLOT(generateClicked())); - masterWidget->addAction(a); + panel->addAction(a); - a = new QAction(masterWidget); + a = new QAction(panel); a->setShortcut(Qt::Key_Escape); connect(a, SIGNAL(triggered()), qApp, SLOT(quit())); - masterWidget->addAction(a); + panel->addAction(a); mReady = true; diff --git a/src/apps/PswGen/GUI/version.h b/src/apps/PswGen/GUI/version.h index 8d9aad3..8f3e970 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,4,5 +#define VER_FILE_VERSION 0,1,5,6 /** * Module/library version number in the string format (shall end with \0) */ -#define VER_FILE_VERSION_STR "0.1.4.5\0" +#define VER_FILE_VERSION_STR "0.1.5.6\0" /** * Module/library name (shall end with \0)