# # # add_file "guitone/src/view/dialogs/Dialog.cpp" # content [aeb857f5148de1e893ce7f6cfcb49f5375d8f45f] # # add_file "guitone/src/view/dialogs/Dialog.h" # content [cb53b8604ec8c5b2268354d6c00fef8fafd830c8] # # patch "guitone/guitone.pro" # from [b7b502078101e207adb5434e6daeb406832822c7] # to [3448c02855a8ee7961b5514502c00941e9ac635f] # # patch "guitone/src/util/Settings.cpp" # from [fd2396b8d67140b19a201d45a72006bccd10ab1f] # to [53eb2f27d05b118d6f65287cfd578b2e08f31ef9] # # patch "guitone/src/util/Settings.h" # from [6a09d2520c6173bcb3d88486fa8876ee341f13d6] # to [3be69fcb30460f05f876b8d990cc5f2964a82231] # # patch "guitone/src/view/MainWindow.cpp" # from [8bfdcacc6cca6397e5aa38ddbbe5f62a8c948ea2] # to [08e952d63474183d73052a9c39d58437638edae2] # # patch "guitone/src/view/dialogs/DatabaseView.cpp" # from [f5e1451aa9681ddc5eee99328a3a423075a39dde] # to [06c1298cbbdf800222e15ffa236507f26c3d48f9] # # patch "guitone/src/view/dialogs/DatabaseView.h" # from [579eb239f3e9451074285b71a28e7f61d169dea8] # to [fda82f6ec5c47ded48a43a4618b4ecdd2c7ee291] # # patch "guitone/src/view/dialogs/FileDiff.cpp" # from [621f1d5b6f724bf5dad9bc3eb9b8e32c963419c1] # to [d50964c71c13049a79af8271ed4a8a0c98112d73] # # patch "guitone/src/view/dialogs/FileDiff.h" # from [59f2323c49ddba5388415b3b8afb810cdc6d7f6d] # to [dcba92805d020b9d0d83de903f27abda0a5a7c74] # # patch "guitone/src/view/dialogs/GenerateKeypair.cpp" # from [63f31288290d16e135a90d2c75e54a81380746d6] # to [a13cb1a8d2d59c4d5c1482b463264829ce7dc3bc] # # patch "guitone/src/view/dialogs/GenerateKeypair.h" # from [f671f4f3d53c0986c773060a23807f689207b74f] # to [898590bc59420b56dab41d58bf2689ea618d1cb0] # # patch "guitone/src/view/dialogs/KeyManagement.cpp" # from [b418a7e71c4b27b4f54db2754ff15b0f8250bc68] # to [891f5c01e99f0438287e418c826c204c748953c4] # # patch "guitone/src/view/dialogs/KeyManagement.h" # from [f83f2cabb4f56acf54265543de839729d78c5818] # to [01b2a2e75eb75d51b9a9d9107242b457019ff924] # # patch "guitone/src/view/dialogs/Preferences.cpp" # from [c3641052ddd621005322368074a6d56b9c0ec848] # to [4aa186cb30ad6ca40b84ce3d0af9ffb3d7ec5dc2] # # patch "guitone/src/view/dialogs/Preferences.h" # from [5550a807422c8442eaad357c60db848618f99793] # to [98a305269f03ee3cf23aba0388f44f93e8b22b0e] # # patch "guitone/src/view/dialogs/RevisionDiff.cpp" # from [106bd19c3f73cbb0a0de05505b7e9b310139025b] # to [fcc65ed14a1745d84da4a77033a9fb652e1391d2] # # patch "guitone/src/view/dialogs/RevisionDiff.h" # from [be23ef4825aefd8431e4aa92719d685fbf3bb57c] # to [e56753fafa9f66fb1041841249f4aef278b84cca] # # patch "guitone/src/view/dialogs/SwitchWorkspaceRevision.cpp" # from [cd37c8705d3bbe1d73c9aa95d41116e4c1b493dd] # to [570cf04bb15e85496ba5f94ba2fb53fe2bc224c8] # # patch "guitone/src/view/dialogs/SwitchWorkspaceRevision.h" # from [5a437a9ea1b711147196df86454b3eda9deb1c1b] # to [9b8c093dc71843dd9af1fcc2eafb073119515d2a] # ============================================================ --- guitone/src/view/dialogs/Dialog.cpp aeb857f5148de1e893ce7f6cfcb49f5375d8f45f +++ guitone/src/view/dialogs/Dialog.cpp aeb857f5148de1e893ce7f6cfcb49f5375d8f45f @@ -0,0 +1,52 @@ +/*************************************************************************** + * Copyright (C) 2007 by Thomas Keller * + * address@hidden * + * * + * This program 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 2 of the License, or * + * (at your option) any later version. * + * * + * This program 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 this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + +#include "Dialog.h" +#include "Settings.h" + +Dialog::Dialog(QWidget* parent) : QDialog(parent) {} + +Dialog::Dialog(QWidget* parent, QString objName) +: QDialog(parent) +{ + setObjectName(objName); +} + +Dialog::~Dialog() +{ + saveState(); +} + +void Dialog::init() +{ + restoreState(); +} + +void Dialog::restoreState(void) +{ + restoreGeometry(Settings::getWindowGeometry(objectName())); +} + +void Dialog::saveState(void) +{ + Settings::setWindowGeometry(saveGeometry(), objectName()); +} + + ============================================================ --- guitone/src/view/dialogs/Dialog.h cb53b8604ec8c5b2268354d6c00fef8fafd830c8 +++ guitone/src/view/dialogs/Dialog.h cb53b8604ec8c5b2268354d6c00fef8fafd830c8 @@ -0,0 +1,41 @@ +/*************************************************************************** + * Copyright (C) 2007 by Thomas Keller * + * address@hidden * + * * + * This program 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 2 of the License, or * + * (at your option) any later version. * + * * + * This program 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 this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + +#ifndef DIALOG_H +#define DIALOG_H + +#include + +class Dialog : public QDialog +{ + Q_OBJECT + +public: + Dialog(QWidget*); + Dialog(QWidget*, QString); + ~Dialog(); + void init(); + +private: + void restoreState(void); + void saveState(void); +}; + +#endif ============================================================ --- guitone/guitone.pro b7b502078101e207adb5434e6daeb406832822c7 +++ guitone/guitone.pro 3448c02855a8ee7961b5514502c00941e9ac635f @@ -19,6 +19,7 @@ HEADERS += src/view/MainWindow.h \ src/view/AttributesView.h \ src/view/DiffView.h \ src/view/DiffStatusView.h \ + src/view/dialogs/Dialog.h \ src/view/dialogs/SwitchWorkspaceRevision.h \ src/view/dialogs/Preferences.h \ src/view/dialogs/FileDiff.h \ @@ -58,6 +59,7 @@ SOURCES += src/view/MainWindow.cpp \ src/view/AttributesView.cpp \ src/view/DiffView.cpp \ src/view/DiffStatusView.cpp \ + src/view/dialogs/Dialog.cpp \ src/view/dialogs/SwitchWorkspaceRevision.cpp \ src/view/dialogs/Preferences.cpp \ src/view/dialogs/FileDiff.cpp \ ============================================================ --- guitone/src/util/Settings.cpp fd2396b8d67140b19a201d45a72006bccd10ab1f +++ guitone/src/util/Settings.cpp 53eb2f27d05b118d6f65287cfd578b2e08f31ef9 @@ -37,8 +37,7 @@ void Settings::setBool(const QString &na void Settings::setBool(const QString &name, bool value) { - Settings *settings = singleton(); - settings->setValue(name, value); + singleton()->setValue(name, value); } bool Settings::getBool(const QString &name, bool defaultVal) @@ -46,15 +45,14 @@ bool Settings::getBool(const QString &na return singleton()->value(name, defaultVal).toBool(); } -QSize Settings::getStartupSize(const QString &name) +void Settings::setWindowGeometry(const QByteArray & data, const QString & name) { - return singleton()->value(name, QSize(640, 480)).toSize(); + singleton()->setValue(name, data); } -void Settings::setStartupSize(const QString &name, QSize size) +QByteArray Settings::getWindowGeometry(const QString & name) { - Settings *settings = singleton(); - settings->setValue(name, size); + return singleton()->value(name).toByteArray(); } void Settings::sync() @@ -63,19 +61,6 @@ void Settings::sync() settings->QSettings::sync(); } -Qt::WindowStates Settings::getWindowState(const QString &name) -{ - return static_cast( - singleton()->value(name, Qt::WindowNoState).toInt() - ); -} - -void Settings::setWindowState(const QString &name, Qt::WindowStates state) -{ - Settings *settings = singleton(); - settings->setValue(name, (int) state); -} - QString Settings::getMtnBinaryPath() { return singleton()->value("MtnExePath", "mtn").toString(); ============================================================ --- guitone/src/util/Settings.h 6a09d2520c6173bcb3d88486fa8876ee341f13d6 +++ guitone/src/util/Settings.h 3be69fcb30460f05f876b8d990cc5f2964a82231 @@ -29,22 +29,20 @@ public: { public: - static void setBool(const QString &name, bool value); - static bool getBool(const QString &name, bool defaultVal); - static QSize getStartupSize(const QString &name); - static void setStartupSize(const QString &name, QSize size); - static Qt::WindowStates getWindowState(const QString &name); - static void setWindowState(const QString &name, Qt::WindowStates state); + static void setBool(const QString &, bool); + static bool getBool(const QString &, bool); + static void setWindowGeometry(const QByteArray &, const QString &); + static QByteArray getWindowGeometry(const QString &); static QStringList getItemList(const QString &); static void setItemList(const QString &, const QStringList &); static void addItemToList(const QString&, const QString &, int); static void removeItemFromList(const QString &, const QString &); static QString getMtnBinaryPath(); static void setMtnBinaryPath(QString); - static void saveHeaderViewState(QHeaderView*, QString); - static void restoreHeaderViewState(QHeaderView*, QString); + static void saveHeaderViewState(QHeaderView *, QString); + static void restoreHeaderViewState(QHeaderView *, QString); static QByteArray getSplitterState(QString); - static void setSplitterState(const QByteArray&, QString); + static void setSplitterState(const QByteArray &, QString); static void sync(); private: ============================================================ --- guitone/src/view/MainWindow.cpp 8bfdcacc6cca6397e5aa38ddbbe5f62a8c948ea2 +++ guitone/src/view/MainWindow.cpp 08e952d63474183d73052a9c39d58437638edae2 @@ -143,9 +143,8 @@ bool MainWindow::init() mainSplitter->init(); listSplitter->init(); - resize(Settings::getStartupSize("MainWindow")); - setWindowState(Settings::getWindowState("MainWindow")); - + restoreGeometry(Settings::getWindowGeometry("MainWindow")); + // load the most recent previous workspace, if there is any QStringList list = Settings::getItemList("RecentWorkspaceList"); if (list.size() > 0) @@ -241,9 +240,7 @@ void MainWindow::closeEvent(QCloseEvent void MainWindow::closeEvent(QCloseEvent *event) { - // Do some cleanup before closing down the application - Settings::setStartupSize("MainWindow", size()); - Settings::setWindowState("MainWindow", windowState()); + Settings::setWindowGeometry(saveGeometry(), "MainWindow"); event->accept(); } ============================================================ --- guitone/src/view/dialogs/DatabaseView.cpp f5e1451aa9681ddc5eee99328a3a423075a39dde +++ guitone/src/view/dialogs/DatabaseView.cpp 06c1298cbbdf800222e15ffa236507f26c3d48f9 @@ -20,11 +20,13 @@ #include "DatabaseView.h" -#include "../../util/Settings.h" +#include "Settings.h" -DatabaseView::DatabaseView(QWidget *parent) : QDialog(parent) +DatabaseView::DatabaseView(QWidget *parent) : Dialog(parent) { setupUi(this); + Dialog::init(); + this->setWindowFlags(this->windowFlags() | Qt::WindowMaximizeButtonHint); this->setWindowFlags(this->windowFlags() | Qt::WindowMinimizeButtonHint); innerSplitter->init(); @@ -33,8 +35,6 @@ DatabaseView::DatabaseView(QWidget *pare tree = Settings::getBool("DatabaseViewTree", false); initTreeWidget(); - resize(Settings::getStartupSize("DatabaseViewStartupSize")); - setWindowState(Settings::getWindowState("DatabaseViewWindowState")); connect(branches, SIGNAL(clicked(QModelIndex)), this, SLOT(branchesClicked(QModelIndex))); @@ -76,23 +76,6 @@ void DatabaseView::branchesRead() branches->setExpanded(branchModel->index(0, 0, QModelIndex()), true); } -void DatabaseView::closeEvent(QCloseEvent *event) -{ - // Do some cleanup before closing down the application - // FIXME: there should be a generalized Dialog class which does that for - // all dialogs automatically - Settings::setStartupSize("DatabaseViewStartupSize", curSize); - Settings::setWindowState("DatabaseViewWindowState", windowState()); - event->accept(); -} - -void DatabaseView::resizeEvent ( QResizeEvent * event ) -{ - if(windowState() == Qt::WindowNoState) - curSize = size(); - event->accept(); -} - void DatabaseView::readChangesets(const QString &branch) { qDebug() << branch; ============================================================ --- guitone/src/view/dialogs/DatabaseView.h 579eb239f3e9451074285b71a28e7f61d169dea8 +++ guitone/src/view/dialogs/DatabaseView.h fda82f6ec5c47ded48a43a4618b4ecdd2c7ee291 @@ -22,11 +22,13 @@ #define DATABASEVIEW_H #include "ui_databaseview.h" +#include "Monotone.h" +#include "Branches.h" +#include "Dialog.h" + #include -#include "../../monotone/Monotone.h" -#include "../../model/Branches.h" -class DatabaseView : public QDialog, private Ui::DatabaseView +class DatabaseView : public Dialog, private Ui::DatabaseView { Q_OBJECT @@ -44,9 +46,6 @@ private: bool tree; void initTreeWidget(); void readChangesets(const QString &branch); - void resizeEvent ( QResizeEvent * event ); - void closeEvent(QCloseEvent *); - QSize curSize; }; #endif //DATABASEVIEW_H ============================================================ --- guitone/src/view/dialogs/FileDiff.cpp 621f1d5b6f724bf5dad9bc3eb9b8e32c963419c1 +++ guitone/src/view/dialogs/FileDiff.cpp d50964c71c13049a79af8271ed4a8a0c98112d73 @@ -25,23 +25,22 @@ #include -FileDiff::FileDiff(QWidget* parent) - : QDialog(parent) +FileDiff::FileDiff(QWidget* parent) : Dialog(parent) { setupUi(this); + Dialog::init(); } -FileDiff::FileDiff(QWidget* parent, QString fileName) - : QDialog(parent) +FileDiff::FileDiff(QWidget* parent, QString fileName) : Dialog(parent) { setupUi(this); + Dialog::init(); init(fileName); } void FileDiff::init(QString fileName) { - resize(Settings::getStartupSize("FileDiffStartupSize")); - connect( + connect( showVersionLeft, SIGNAL(toggled(bool)), this, SLOT(versionToggled(bool)) ); @@ -94,10 +93,7 @@ void FileDiff::init(QString fileName) } } -FileDiff::~FileDiff() -{ - Settings::setStartupSize("FileDiffStartupSize", size()); -} +FileDiff::~FileDiff() {} void FileDiff::versionToggled(bool dummy) { ============================================================ --- guitone/src/view/dialogs/FileDiff.h 59f2323c49ddba5388415b3b8afb810cdc6d7f6d +++ guitone/src/view/dialogs/FileDiff.h dcba92805d020b9d0d83de903f27abda0a5a7c74 @@ -21,12 +21,13 @@ #ifndef FILE_DIFF_H #define FILE_DIFF_H +#include "Dialog.h" #include "ui_file_diff.h" #include "ContentDiff.h" #include "GetFile.h" #include "GetFileProxyModel.h" -class FileDiff : public QDialog, private Ui::FileDiffDialog +class FileDiff : public Dialog, private Ui::FileDiffDialog { Q_OBJECT ============================================================ --- guitone/src/view/dialogs/GenerateKeypair.cpp 63f31288290d16e135a90d2c75e54a81380746d6 +++ guitone/src/view/dialogs/GenerateKeypair.cpp a13cb1a8d2d59c4d5c1482b463264829ce7dc3bc @@ -25,9 +25,10 @@ GenerateKeypair::GenerateKeypair(QWidget #include GenerateKeypair::GenerateKeypair(QWidget* parent) - : QDialog(parent) + : Dialog(parent) { setupUi(this); + Dialog::init(); } GenerateKeypair::~GenerateKeypair() {} ============================================================ --- guitone/src/view/dialogs/GenerateKeypair.h f671f4f3d53c0986c773060a23807f689207b74f +++ guitone/src/view/dialogs/GenerateKeypair.h 898590bc59420b56dab41d58bf2689ea618d1cb0 @@ -21,9 +21,10 @@ #ifndef GENERATEKEYPAIR_H #define GENERATEKEYPAIR_H +#include "Dialog.h" #include "ui_generate_keypair.h" -class GenerateKeypair : public QDialog, private Ui::GenerateKeypair +class GenerateKeypair : public Dialog, private Ui::GenerateKeypair { Q_OBJECT ============================================================ --- guitone/src/view/dialogs/KeyManagement.cpp b418a7e71c4b27b4f54db2754ff15b0f8250bc68 +++ guitone/src/view/dialogs/KeyManagement.cpp 891f5c01e99f0438287e418c826c204c748953c4 @@ -20,7 +20,6 @@ #include "KeyManagement.h" #include "GenerateKeypair.h" -#include "Settings.h" #include "Monotone.h" #include @@ -29,10 +28,10 @@ KeyManagement::KeyManagement(QWidget* pa #include KeyManagement::KeyManagement(QWidget* parent) - : QDialog(parent) + : Dialog(parent) { setupUi(this); - resize(Settings::getStartupSize("KeyManagementStartupSize")); + Dialog::init(); model = new Keys(this); keyList->setModel(model); @@ -69,10 +68,7 @@ KeyManagement::KeyManagement(QWidget* pa popupMenu->addAction(act); } -KeyManagement::~KeyManagement() -{ - Settings::setStartupSize("KeyManagementStartupSize", size()); -} +KeyManagement::~KeyManagement() {} void KeyManagement::generateKeypair() { @@ -117,6 +113,6 @@ void KeyManagement::copyPubkeyDataToClip void KeyManagement::copyPubkeyDataToClipboard() { - qDebug("KeyManagement::copyPubkeyDataToClipboard: no automate pubkey available!"); + qDebug("KeyManagement::copyPubkeyDataToClipboard: stub: no automate pubkey available!"); } ============================================================ --- guitone/src/view/dialogs/KeyManagement.h f83f2cabb4f56acf54265543de839729d78c5818 +++ guitone/src/view/dialogs/KeyManagement.h 01b2a2e75eb75d51b9a9d9107242b457019ff924 @@ -22,12 +22,13 @@ #define KEYMANAGEMENT_H #include "Keys.h" +#include "Dialog.h" #include "ui_key_management.h" #include #include -class KeyManagement : public QDialog, private Ui::KeyManagement +class KeyManagement : public Dialog, private Ui::KeyManagement { Q_OBJECT ============================================================ --- guitone/src/view/dialogs/Preferences.cpp c3641052ddd621005322368074a6d56b9c0ec848 +++ guitone/src/view/dialogs/Preferences.cpp 4aa186cb30ad6ca40b84ce3d0af9ffb3d7ec5dc2 @@ -19,17 +19,18 @@ ***************************************************************************/ #include "Preferences.h" +#include "Monotone.h" #include "Settings.h" -#include "Monotone.h" #include #include #include -Preferences::Preferences(QWidget* parent) - : QDialog(parent) +Preferences::Preferences(QWidget* parent) : Dialog(parent) { setupUi(this); + Dialog::init(); + mtnExecutablePath->setText(Settings::getMtnBinaryPath()); connect( ============================================================ --- guitone/src/view/dialogs/Preferences.h 5550a807422c8442eaad357c60db848618f99793 +++ guitone/src/view/dialogs/Preferences.h 98a305269f03ee3cf23aba0388f44f93e8b22b0e @@ -21,9 +21,10 @@ #ifndef PREFERENCES_H #define PREFERENCES_H +#include "Dialog.h" #include "ui_preferences.h" -class Preferences : public QDialog, private Ui::PreferencesDialog +class Preferences : public Dialog, private Ui::PreferencesDialog { Q_OBJECT ============================================================ --- guitone/src/view/dialogs/RevisionDiff.cpp 106bd19c3f73cbb0a0de05505b7e9b310139025b +++ guitone/src/view/dialogs/RevisionDiff.cpp fcc65ed14a1745d84da4a77033a9fb652e1391d2 @@ -20,14 +20,14 @@ #include "RevisionDiff.h" #include "Monotone.h" -#include "Settings.h" #include -RevisionDiff::RevisionDiff(QWidget* parent) - : QDialog(parent) +RevisionDiff::RevisionDiff(QWidget* parent) : Dialog(parent) { setupUi(this); + Dialog::init(); + diffView->setItemsExpandable(true); diffView->setRootIsDecorated(true); // arrow width is approx. 10px @@ -36,8 +36,7 @@ void RevisionDiff::init(QString path, QS void RevisionDiff::init(QString path, QString leftRevision, QString rightRevision) { - resize(Settings::getStartupSize("RevisionDiffStartupSize")); - QString title = windowTitle(); + QString title = windowTitle(); QString left = tr("base revision"); QString right = tr("workspace revision"); @@ -64,8 +63,5 @@ void RevisionDiff::init(QString path, QS } } -RevisionDiff::~RevisionDiff() -{ - Settings::setStartupSize("RevisionDiffStartupSize", size()); -} +RevisionDiff::~RevisionDiff() {} ============================================================ --- guitone/src/view/dialogs/RevisionDiff.h be23ef4825aefd8431e4aa92719d685fbf3bb57c +++ guitone/src/view/dialogs/RevisionDiff.h e56753fafa9f66fb1041841249f4aef278b84cca @@ -21,10 +21,11 @@ #ifndef REVISION_DIFF_H #define REVISION_DIFF_H +#include "Dialog.h" #include "ui_revision_diff.h" #include "ContentDiff.h" -class RevisionDiff : public QDialog, private Ui::RevisionDiffDialog +class RevisionDiff : public Dialog, private Ui::RevisionDiffDialog { Q_OBJECT ============================================================ --- guitone/src/view/dialogs/SwitchWorkspaceRevision.cpp cd37c8705d3bbe1d73c9aa95d41116e4c1b493dd +++ guitone/src/view/dialogs/SwitchWorkspaceRevision.cpp 570cf04bb15e85496ba5f94ba2fb53fe2bc224c8 @@ -19,16 +19,18 @@ ***************************************************************************/ #include "SwitchWorkspaceRevision.h" +#include "Settings.h" #include #include -#include "Settings.h" SwitchWorkspaceRevision::SwitchWorkspaceRevision(QWidget* parent) - : QDialog(parent) + : Dialog(parent) { setupUi(this); - resize(Settings::getStartupSize("SwitchWorkspaceRevisionStartupSize")); + Dialog::init(); + splitter->init(); + // add some items to the selector box selectorBox->addItem(tr("Revision"), "i"); selectorBox->addItem(tr("Branch"), "b"); @@ -87,15 +89,9 @@ SwitchWorkspaceRevision::SwitchWorkspace // disable the OK button unless we have a valid selected revision okButton->setEnabled(false); - - // restore the split view - //splitter->restoreState(); } -SwitchWorkspaceRevision::~SwitchWorkspaceRevision() -{ - Settings::setStartupSize("SwitchWorkspaceRevisionStartupSize", size()); -} +SwitchWorkspaceRevision::~SwitchWorkspaceRevision() {} void SwitchWorkspaceRevision::triggerRevisionSearch() { @@ -252,21 +248,8 @@ void SwitchWorkspaceRevision::accept() void SwitchWorkspaceRevision::accept() { - saveState(); // TODO: send out a signal to let the main view update the inventory qDebug("No functionality yet, sorry"); done(0); } -void SwitchWorkspaceRevision::reject() -{ - saveState(); - done(1); -} - -void SwitchWorkspaceRevision::saveState() -{ - // save the states of the UI elements - //splitter->saveState(); -} - ============================================================ --- guitone/src/view/dialogs/SwitchWorkspaceRevision.h 5a437a9ea1b711147196df86454b3eda9deb1c1b +++ guitone/src/view/dialogs/SwitchWorkspaceRevision.h 9b8c093dc71843dd9af1fcc2eafb073119515d2a @@ -21,6 +21,7 @@ #ifndef SWITCH_WORKSPACE_REVISION_H #define SWITCH_WORKSPACE_REVISION_H +#include "Dialog.h" #include "ui_switch_workspace.h" #include "Select.h" #include "Certs.h" @@ -30,7 +31,7 @@ #include -class SwitchWorkspaceRevision : public QDialog, private Ui::SwitchWorkspaceRevision +class SwitchWorkspaceRevision : public Dialog, private Ui::SwitchWorkspaceRevision { Q_OBJECT @@ -45,8 +46,6 @@ private: Tags * tagsModel; Keys * keysModel; QCompleter * selectorCompleter; - - void saveState(); private slots: void triggerRevisionSearch(); @@ -54,7 +53,6 @@ private slots: void enableDisableOkButton(const QModelIndex&); void setCompleter(int); void accept(); - void reject(); }; #endif