Menu
▾
▴
[QTerm-cvs] SF.net SVN: qterm:[1336] trunk/qterm/src
|
From: <hep...@us...> - 2013-12-26 03:24:35
|
Revision: 1336
http://sourceforge.net/p/qterm/code/1336
Author: hephooey
Date: 2013-12-26 03:24:32 +0000 (Thu, 26 Dec 2013)
Log Message:
-----------
Save the geometry of all the dialogs
Modified Paths:
--------------
trunk/qterm/src/aboutdialog.cpp
trunk/qterm/src/addrdialog.cpp
trunk/qterm/src/articledialog.cpp
trunk/qterm/src/closedialog.cpp
trunk/qterm/src/prefdialog.cpp
trunk/qterm/src/qtermframe.cpp
trunk/qterm/src/qtermglobal.cpp
trunk/qterm/src/qtermglobal.h
trunk/qterm/src/quickdialog.cpp
trunk/qterm/src/schemedialog.cpp
trunk/qterm/src/shortcutsdialog.cpp
trunk/qterm/src/shortcutsdialog.h
trunk/qterm/src/toolbardialog.cpp
trunk/qterm/src/toolbardialog.h
trunk/qterm/src/zmodemdialog.cpp
Modified: trunk/qterm/src/aboutdialog.cpp
===================================================================
--- trunk/qterm/src/aboutdialog.cpp 2013-10-25 11:41:54 UTC (rev 1335)
+++ trunk/qterm/src/aboutdialog.cpp 2013-12-26 03:24:32 UTC (rev 1336)
@@ -45,6 +45,7 @@
ui.TextLabel->setText("QTerm "+QString(QTERM_VERSION)+" (Qt "+QT_VERSION_STR+" based)");
//connect(ui.closeButton, SIGNAL(clicked()), this, SLOT(accept()));
+ restoreGeometry(Global::instance()->loadGeometry("About"));
}
/*
@@ -53,6 +54,7 @@
aboutDialog::~aboutDialog()
{
// no need to delete child widgets, Qt does it all for us
+ Global::instance()->saveGeometry("About",saveGeometry());
}
} // namespace QTerm
Modified: trunk/qterm/src/addrdialog.cpp
===================================================================
--- trunk/qterm/src/addrdialog.cpp 2013-10-25 11:41:54 UTC (rev 1335)
+++ trunk/qterm/src/addrdialog.cpp 2013-12-26 03:24:32 UTC (rev 1336)
@@ -49,7 +49,6 @@
updateKeyboardProfiles();
if (bPartial) {
ui.nameTreeView->hide();
- ui.Line->hide();
ui.connectPushButton->hide();
ui.closePushButton->setText(tr("Cancel"));
ui.applyPushButton->setText(tr("OK"));
@@ -57,14 +56,9 @@
ui.applyPushButton->move(ui.applyPushButton->x() - 110, ui.applyPushButton->y());
ui.resetPushButton->move(ui.resetPushButton->x() - 210, ui.resetPushButton->y());
ui.tabWidget->move(ui.tabWidget->x() - 210, ui.tabWidget->y());
- resize(600, 600);
- setMinimumSize(QSize(600, 600));
- setMaximumSize(QSize(600, 600));
setWindowTitle(tr("Setting"));
+ restoreGeometry(Global::instance()->loadGeometry("Setting"));
} else {
- resize(800, 600);
- setMinimumSize(QSize(800, 600));
- setMaximumSize(QSize(800, 600));
setWindowTitle(tr("AddressBook"));
QDomDocument doc = Global::instance()->addrXml();
@@ -75,6 +69,7 @@
Global::instance()->loadAddress(doc, QUuid().toString(), param);
updateData(false);
ui.nameTreeView->setFocus(Qt::OtherFocusReason);
+ restoreGeometry(Global::instance()->loadGeometry("AddressBook"));
}
connectSlots();
}
@@ -84,6 +79,11 @@
*/
addrDialog::~addrDialog()
{
+ if (bPartial) {
+ Global::instance()->saveGeometry("Setting",saveGeometry());
+ } else {
+ Global::instance()->saveGeometry("AddressBook",saveGeometry());
+ }
}
QString addrDialog :: uuid()
Modified: trunk/qterm/src/articledialog.cpp
===================================================================
--- trunk/qterm/src/articledialog.cpp 2013-10-25 11:41:54 UTC (rev 1335)
+++ trunk/qterm/src/articledialog.cpp 2013-12-26 03:24:32 UTC (rev 1336)
@@ -8,6 +8,7 @@
****************************************************************************/
#include "articledialog.h"
+#include "qtermglobal.h"
#include <QFileDialog>
#include <QMessageBox>
namespace QTerm
@@ -25,6 +26,7 @@
{
ui.setupUi(this);
connect(ui.saveButton, SIGNAL(clicked()), this, SLOT(onSave()));
+ restoreGeometry(Global::instance()->loadGeometry("Article"));
}
/*
@@ -33,6 +35,7 @@
articleDialog::~articleDialog()
{
// no need to delete child widgets, Qt does it all for us
+ Global::instance()->saveGeometry("Article",saveGeometry());
}
void articleDialog::onSave()
Modified: trunk/qterm/src/closedialog.cpp
===================================================================
--- trunk/qterm/src/closedialog.cpp 2013-10-25 11:41:54 UTC (rev 1335)
+++ trunk/qterm/src/closedialog.cpp 2013-12-26 03:24:32 UTC (rev 1336)
@@ -11,6 +11,7 @@
//
#include "closedialog.h"
+#include "qtermglobal.h"
#include <QTimer>
namespace QTerm
@@ -24,11 +25,12 @@
connect(m_timer, SIGNAL(timeout()), this, SLOT(changeTitle()));
changeTitle();
m_timer->start(1000);
+ restoreGeometry(Global::instance()->loadGeometry("Close"));
}
CloseDialog::~CloseDialog()
{
-
+ Global::instance()->saveGeometry("Close",saveGeometry());
}
void CloseDialog::changeTitle()
Modified: trunk/qterm/src/prefdialog.cpp
===================================================================
--- trunk/qterm/src/prefdialog.cpp 2013-10-25 11:41:54 UTC (rev 1335)
+++ trunk/qterm/src/prefdialog.cpp 2013-12-26 03:24:32 UTC (rev 1336)
@@ -33,6 +33,9 @@
ui.setupUi(this);
connectSlots();
+
+ restoreGeometry(Global::instance()->loadGeometry("Pref"));
+
loadSetting();
}
@@ -43,6 +46,7 @@
prefDialog::~prefDialog()
{
// no need to delete child widgets, Qt does it all for us
+ Global::instance()->saveGeometry("Pref",saveGeometry());
}
void prefDialog::connectSlots()
Modified: trunk/qterm/src/qtermframe.cpp
===================================================================
--- trunk/qterm/src/qtermframe.cpp 2013-10-25 11:41:54 UTC (rev 1335)
+++ trunk/qterm/src/qtermframe.cpp 2013-12-26 03:24:32 UTC (rev 1336)
@@ -183,8 +183,8 @@
{
Global::instance()->loadConfig();
- restoreGeometry(Global::instance()->loadGeometry());
- restoreState(Global::instance()->loadState());
+ restoreGeometry(Global::instance()->loadGeometry("Frame"));
+ restoreState(Global::instance()->loadState("Frame"));
if (Global::instance()->isFullScreen()) {
actionFullscreen->setChecked(true);
showFullScreen();
@@ -242,8 +242,8 @@
void Frame::saveSetting()
{
- Global::instance()->saveGeometry(saveGeometry());
- Global::instance()->saveState(saveState());
+ Global::instance()->saveGeometry("Frame", saveGeometry());
+ Global::instance()->saveState("Frame", saveState());
Global::instance()->saveConfig();
saveShortcuts();
saveToolbars();
@@ -660,8 +660,8 @@
//TODO: add an item to the popup menu so we can go back to normal without touch the keyboard
if (isFullScreen) {
- Global::instance()->saveGeometry(saveGeometry());
- Global::instance()->saveState(saveState());
+ Global::instance()->saveGeometry("Frame",saveGeometry());
+ Global::instance()->saveState("Frame",saveState());
mainToolBar->hide();
terminalToolBar->hide();
keyToolBar->hide();
@@ -675,8 +675,8 @@
mdiArea->setViewMode(QMdiArea::SubWindowView);
mdiArea->activeSubWindow()->showMaximized();
} else {
- restoreGeometry(Global::instance()->loadGeometry());
- restoreState(Global::instance()->loadState());
+ restoreGeometry(Global::instance()->loadGeometry("Frame"));
+ restoreState(Global::instance()->loadState("Frame"));
emit scrollChanged();
QList<QMdiSubWindow *> windows = mdiArea->subWindowList();
foreach (QMdiSubWindow * window, windows) {
@@ -990,16 +990,16 @@
showNormal();
#endif
}
- restoreGeometry(Global::instance()->loadGeometry());
- restoreState(Global::instance()->loadState());
+ restoreGeometry(Global::instance()->loadGeometry("Frame"));
+ restoreState(Global::instance()->loadState("Frame"));
raise();
activateWindow();
}
void Frame::trayHide()
{
- Global::instance()->saveGeometry(saveGeometry());
- Global::instance()->saveState(saveState());
+ Global::instance()->saveGeometry("Frame",saveGeometry());
+ Global::instance()->saveState("Frame",saveState());
hide();
}
Modified: trunk/qterm/src/qtermglobal.cpp
===================================================================
--- trunk/qterm/src/qtermglobal.cpp 2013-10-25 11:41:54 UTC (rev 1335)
+++ trunk/qterm/src/qtermglobal.cpp 2013-12-26 03:24:32 UTC (rev 1336)
@@ -759,24 +759,24 @@
}
-QByteArray Global::loadGeometry()
+QByteArray Global::loadGeometry(const QString & window)
{
- return m_config->getItemValue("global","geometry").toByteArray();
+ return m_config->getItemValue("global",window+"_geometry").toByteArray();
}
-QByteArray Global::loadState()
+QByteArray Global::loadState(const QString & window)
{
- return m_config->getItemValue("global","state").toByteArray();
+ return m_config->getItemValue("global",window+"_state").toByteArray();
}
-void Global::saveGeometry(const QByteArray geometry)
+void Global::saveGeometry(const QString & window, const QByteArray & geometry)
{
- m_config->setItemValue("global", "geometry", geometry);
+ m_config->setItemValue("global", window+"_geometry", geometry);
}
-void Global::saveState(const QByteArray state)
+void Global::saveState(const QString & window, const QByteArray & state)
{
- m_config->setItemValue("global", "state", state);
+ m_config->setItemValue("global", window+"_state", state);
}
void Global::saveSession(const QList<QVariant>& sites)
Modified: trunk/qterm/src/qtermglobal.h
===================================================================
--- trunk/qterm/src/qtermglobal.h 2013-10-25 11:41:54 UTC (rev 1335)
+++ trunk/qterm/src/qtermglobal.h 2013-12-26 03:24:32 UTC (rev 1336)
@@ -122,10 +122,10 @@
void setStyle(const QString & style);
void loadConfig(); //TODO: Merge with iniSettings
void saveConfig();
- QByteArray loadGeometry();
- QByteArray loadState();
- void saveGeometry( const QByteArray geometry);
- void saveState( const QByteArray state);
+ QByteArray loadGeometry(const QString & window);
+ QByteArray loadState(const QString & window);
+ void saveGeometry(const QString & window, const QByteArray & geometry);
+ void saveState(const QString & window, const QByteArray & state);
void saveSession(const QList<QVariant>& sites);
QList<QVariant> loadSession();
void cleanup();
Modified: trunk/qterm/src/quickdialog.cpp
===================================================================
--- trunk/qterm/src/quickdialog.cpp 2013-10-25 11:41:54 UTC (rev 1335)
+++ trunk/qterm/src/quickdialog.cpp 2013-12-26 03:24:32 UTC (rev 1336)
@@ -44,6 +44,7 @@
pConf = Global::instance()->fileCfg();
loadHistory();
+ restoreGeometry(Global::instance()->loadGeometry("Quick"));
}
@@ -52,6 +53,7 @@
*/
quickDialog::~quickDialog()
{
+ Global::instance()->saveGeometry("Quick",saveGeometry());
}
void quickDialog::closeEvent(QCloseEvent *)
Modified: trunk/qterm/src/schemedialog.cpp
===================================================================
--- trunk/qterm/src/schemedialog.cpp 2013-10-25 11:41:54 UTC (rev 1335)
+++ trunk/qterm/src/schemedialog.cpp 2013-12-26 03:24:32 UTC (rev 1336)
@@ -21,11 +21,14 @@
connectSlots();
fileList = loadSchemeList();
updateList();
+
+ restoreGeometry(Global::instance()->loadGeometry("Scheme"));
}
schemeDialog::~schemeDialog()
{
+ Global::instance()->saveGeometry("Scheme",saveGeometry());
}
void schemeDialog::setScheme(const QString& strSchemeFile)
Modified: trunk/qterm/src/shortcutsdialog.cpp
===================================================================
--- trunk/qterm/src/shortcutsdialog.cpp 2013-10-25 11:41:54 UTC (rev 1335)
+++ trunk/qterm/src/shortcutsdialog.cpp 2013-12-26 03:24:32 UTC (rev 1336)
@@ -1,4 +1,5 @@
#include "shortcutsdialog.h"
+#include "qtermglobal.h"
#include <QtGui/QKeyEvent>
#if QT_VERSION >= 0x050000
#include <QtWidgets/QMessageBox>
@@ -51,8 +52,15 @@
}
tableWidget->resizeColumnsToContents();
tableWidget->setCurrentCell(0, 0);
+
+ restoreGeometry(Global::instance()->loadGeometry("Shortcuts"));
}
+ShortcutsDialog::~ShortcutsDialog()
+{
+ Global::instance()->saveGeometry("Shortcuts",saveGeometry());
+}
+
void ShortcutsDialog::createDefaultShortcut()
{
m_defaultShortcut.insert("actionAbout","F1");
Modified: trunk/qterm/src/shortcutsdialog.h
===================================================================
--- trunk/qterm/src/shortcutsdialog.h 2013-10-25 11:41:54 UTC (rev 1335)
+++ trunk/qterm/src/shortcutsdialog.h 2013-12-26 03:24:32 UTC (rev 1336)
@@ -11,7 +11,7 @@
Q_OBJECT
public:
ShortcutsDialog(QWidget*, QList<QAction*>, QList<QShortcut*>);
- ~ShortcutsDialog() {}
+ ~ShortcutsDialog();
protected slots:
void buttonRemoveClicked();
Modified: trunk/qterm/src/toolbardialog.cpp
===================================================================
--- trunk/qterm/src/toolbardialog.cpp 2013-10-25 11:41:54 UTC (rev 1335)
+++ trunk/qterm/src/toolbardialog.cpp 2013-12-26 03:24:32 UTC (rev 1336)
@@ -1,4 +1,5 @@
#include "toolbardialog.h"
+#include "qtermglobal.h"
#include <QtCore/QRegExp>
#include <QtCore/QSettings>
@@ -13,6 +14,8 @@
#include <QtGui/QToolButton>
#endif
+namespace QTerm {
+
ToolbarDialog::ToolbarDialog(QWidget* parent)
: QDialog(parent),m_defaultToolBars()
{
@@ -55,10 +58,12 @@
connect(comboIconSize, SIGNAL(currentIndexChanged(const QString &)), this, SLOT(comboIconSizeCurrentIndexChanged(const QString &)));
connect(comboButtonStyle, SIGNAL(currentIndexChanged(int)),this, SLOT(comboButtonStyleCurrentIndexChanged(int)));
connect(buttonDefault, SIGNAL(clicked()), this, SLOT(restoreDefaultToolbars()));
+ restoreGeometry(Global::instance()->loadGeometry("Toolbar"));
}
ToolbarDialog::~ToolbarDialog()
{
+ Global::instance()->saveGeometry("Toolbar",saveGeometry());
}
void ToolbarDialog::buttonAddClicked()
@@ -255,4 +260,6 @@
comboToolbarsCurrentIndexChanged(comboToolbars->currentIndex());
}
+} // namespace QTerm
+
#include <moc_toolbardialog.cpp>
Modified: trunk/qterm/src/toolbardialog.h
===================================================================
--- trunk/qterm/src/toolbardialog.h 2013-10-25 11:41:54 UTC (rev 1335)
+++ trunk/qterm/src/toolbardialog.h 2013-12-26 03:24:32 UTC (rev 1336)
@@ -2,7 +2,8 @@
#define TOOLBARDIALOG_H
#include "ui_toolbardialog.h"
-
+namespace QTerm
+{
class ToolbarDialog : public QDialog, public Ui_ToolbarDialog
{
Q_OBJECT
@@ -26,4 +27,5 @@
QMap<QString, QStringList> m_defaultToolBars;
};
+} // namespace QTerm
#endif //TOOLBARDIALOG_H
Modified: trunk/qterm/src/zmodemdialog.cpp
===================================================================
--- trunk/qterm/src/zmodemdialog.cpp 2013-10-25 11:41:54 UTC (rev 1335)
+++ trunk/qterm/src/zmodemdialog.cpp 2013-12-26 03:24:32 UTC (rev 1336)
@@ -1,5 +1,5 @@
-
#include "zmodemdialog.h"
+#include "qtermglobal.h"
#include <QMessageBox>
namespace QTerm
{
@@ -8,10 +8,12 @@
{
ui.setupUi(this);
connect( ui.buttonCancel, SIGNAL(clicked()), this, SLOT(slotCancel()) );
+ restoreGeometry(Global::instance()->loadGeometry("ZModem"));
}
zmodemDialog::~zmodemDialog()
{
+ Global::instance()->saveGeometry("ZModem",saveGeometry());
}
void zmodemDialog::setProgress(int offset)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
