Changeset 172

Timestamp:

03/22/09 05:07:17 (3 years ago)

Author:

antonbatenev.ya.ru

Message:

мелкие интерфейсные изменения с запоминанием и восстановлением форм

Location:

trunk

Files:

• form_message.cpp (modified) (1 diff)
• form_message_ui.cpp (modified) (2 diffs)
• form_message_ui.h (modified) (1 diff)
• form_moderate.cpp (modified) (3 diffs)
• form_moderate.h (modified) (2 diffs)
• form_moderate_ui.cpp (modified) (2 diffs)
• form_moderate_ui.h (modified) (1 diff)
• form_source.cpp (modified) (1 diff)
• form_source.h (modified) (1 diff)
• form_source_ui.cpp (modified) (3 diffs)
• form_source_ui.h (modified) (1 diff)
• sysheaders.h (modified) (1 diff)
• version.h (modified) (1 diff)

trunk/form_message.cpp

@@ -147 +147 @@
 void FormMessage::closeEvent (QCloseEvent* event)
 {
+        // сохранение layout
+        save();
+
         event->accept();
 

trunk/form_message_ui.cpp

@@ -238 +238 @@
         connect(m_menu_code_lisp,    SIGNAL(triggered()), this, SLOT(menu_code_lisp_triggered()));
         connect(m_menu_code_haskell, SIGNAL(triggered()), this, SLOT(menu_code_haskell_triggered()));
+
+        // восстановление layout
+        restore();
 }
 //----------------------------------------------------------------------------------------------
@@ -243 +246 @@
 FormMessageUI::~FormMessageUI ()
 {
+}
+//----------------------------------------------------------------------------------------------
+
+void FormMessageUI::save ()
+{
+        QSettings settings;
+
+        if (windowState() == Qt::WindowNoState)
+        {
+                QRect rect = geometry();
+
+                settings.setValue("form_message/left",   rect.left());
+                settings.setValue("form_message/top",    rect.top());
+                settings.setValue("form_message/width",  rect.width());
+                settings.setValue("form_message/height", rect.height());
+        }
+
+        settings.setValue("form_message/state", static_cast<int>(windowState()));
+}
+//----------------------------------------------------------------------------------------------
+
+void FormMessageUI::restore ()
+{
+        QSettings settings;
+
+        QRect screen = QDesktopWidget().screenGeometry(this);
+
+        int w = settings.value("form_message/width",  width()).toInt();
+        int h = settings.value("form_message/height", height()).toInt();
+        int x = settings.value("form_message/left",   (screen.width()  - w) / 2).toInt();
+        int y = settings.value("form_message/top",    (screen.height() - h) / 2).toInt();
+
+        // setGeometry как-то некорректно работает :(
+        resize(w, h);
+        move(x, y);
+
+        Qt::WindowStates state = static_cast<Qt::WindowStates>(settings.value("form_message/state", Qt::WindowNoState).toInt());
+
+        setWindowState(state);
 }
 //----------------------------------------------------------------------------------------------

trunk/form_message_ui.h

@@ -27 +27 @@
 
         protected:
+
+                /*!
+                 * \brief Функция сохранения расположения и размеров элементов управления формы <при выходе>
+                 */
+                void save ();
+
+                /*!
+                 * \brief Функция восстановления расположения и размеров элементов управления формы <при старте>
+                 */
+                void restore ();
 
                 /*!

trunk/form_moderate.cpp

@@ -65 +65 @@
 
         connect(m_button_ok,     SIGNAL(clicked()), this, SLOT(button_ok_clicked()));
-        connect(m_button_cancel, SIGNAL(clicked()), this, SLOT(reject()));
+        connect(m_button_cancel, SIGNAL(clicked()), this, SLOT(button_cancel_clicked()));
 }
 //----------------------------------------------------------------------------------------------
@@ -71 +71 @@
 FormModerate::~FormModerate ()
 {
+}
+//----------------------------------------------------------------------------------------------
+
+void FormModerate::closeEvent (QCloseEvent* event)
+{
+        // сохранение layout
+        save();
+
+        event->accept();
+
+        deleteLater();
 }
 //----------------------------------------------------------------------------------------------
@@ -120 +131 @@
                 m_forum_tree->reloadUnread(false);
 
+        // сохранение layout
+        save();
+
+        // OK
         accept();
 }
 //----------------------------------------------------------------------------------------------
+
+void FormModerate::button_cancel_clicked ()
+{
+        // сохранение layout
+        save();
+
+        // Отмена
+        reject();
+}
+//----------------------------------------------------------------------------------------------

trunk/form_moderate.h

@@ -39 +39 @@
                 void setForumTree (IForumTree* itf);
 
+        protected:
+
+                /*!
+                 * \brief Событие закрытия формы (см. Qt::QDialog).
+                 */
+                virtual void closeEvent (QCloseEvent* event);
+
         private:
 
@@ -62 +69 @@
                  */
                 void button_ok_clicked ();
+
+                /*!
+                 * \brief Отмена
+                 */
+                void button_cancel_clicked ();
 };
 

trunk/form_moderate_ui.cpp

@@ -147 +147 @@
 
         connect(m_combo_action, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(combo_action_current_index_changed(const QString&)));
+
+        // восстановление layout
+        restore();
 }
 //----------------------------------------------------------------------------------------------
@@ -152 +155 @@
 FormModerateUI::~FormModerateUI ()
 {
+}
+//----------------------------------------------------------------------------------------------
+
+void FormModerateUI::save ()
+{
+        QSettings settings;
+
+        if (windowState() == Qt::WindowNoState)
+        {
+                QRect rect = geometry();
+
+                settings.setValue("form_moderate/left",   rect.left());
+                settings.setValue("form_moderate/top",    rect.top());
+                settings.setValue("form_moderate/width",  rect.width());
+                settings.setValue("form_moderate/height", rect.height());
+        }
+
+        settings.setValue("form_moderate/state", static_cast<int>(windowState()));
+}
+//----------------------------------------------------------------------------------------------
+
+void FormModerateUI::restore ()
+{
+        QSettings settings;
+
+        QRect screen = QDesktopWidget().screenGeometry(this);
+
+        int w = settings.value("form_moderate/width",  width()).toInt();
+        int h = settings.value("form_moderate/height", height()).toInt();
+        int x = settings.value("form_moderate/left",   (screen.width()  - w) / 2).toInt();
+        int y = settings.value("form_moderate/top",    (screen.height() - h) / 2).toInt();
+
+        // setGeometry как-то некорректно работает :(
+        resize(w, h);
+        move(x, y);
+
+        Qt::WindowStates state = static_cast<Qt::WindowStates>(settings.value("form_moderate/state", Qt::WindowNoState).toInt());
+
+        setWindowState(state);
 }
 //----------------------------------------------------------------------------------------------

trunk/form_moderate_ui.h

@@ -52 +52 @@
 
                 /*!
+                 * \brief Функция сохранения расположения и размеров элементов управления формы <при выходе>
+                 */
+                void save ();
+
+                /*!
+                 * \brief Функция восстановления расположения и размеров элементов управления формы <при старте>
+                 */
+                void restore ();
+
+                /*!
                  * \brief Список возможных действий
                  */

trunk/form_source.cpp

@@ -18 +18 @@
 }
 //----------------------------------------------------------------------------------------------
+
+void FormSource::closeEvent (QCloseEvent* event)
+{
+        // сохранение layout
+        save();
+
+        event->accept();
+
+        deleteLater();
+}
+//----------------------------------------------------------------------------------------------

trunk/form_source.h

@@ -30 +30 @@
                 FormSource  (QWidget* parent, const QString& body);
                 ~FormSource ();
+
+        protected:
+
+                /*!
+                 * \brief Событие закрытия формы (см. Qt::QDialog).
+                 */
+                void closeEvent (QCloseEvent* event);
 };
 

trunk/form_source_ui.cpp

@@ -13 +13 @@
         setWindowIcon(QIcon(":/icons/viewsource16.png"));
 
-        resize(600, 500);
-        setFixedSize(width(), height());
+        resize(400, 300);
+        setMinimumSize(QSize(400, 300));
 
         m_layout = new QVBoxLayout(this);
@@ -23 +23 @@
 
         m_layout->addWidget(m_text_source);
+
+        // восстановление layout
+        restore();
 }
 //----------------------------------------------------------------------------------------------
@@ -30 +33 @@
 }
 //----------------------------------------------------------------------------------------------
+
+void FormSourceUI::save ()
+{
+        QSettings settings;
+
+        if (windowState() == Qt::WindowNoState)
+        {
+                QRect rect = geometry();
+
+                settings.setValue("form_source/left",   rect.left());
+                settings.setValue("form_source/top",    rect.top());
+                settings.setValue("form_source/width",  rect.width());
+                settings.setValue("form_source/height", rect.height());
+        }
+
+        settings.setValue("form_source/state", static_cast<int>(windowState()));
+}
+//----------------------------------------------------------------------------------------------
+
+void FormSourceUI::restore ()
+{
+        QSettings settings;
+
+        QRect screen = QDesktopWidget().screenGeometry(this);
+
+        int w = settings.value("form_source/width",  width()).toInt();
+        int h = settings.value("form_source/height", height()).toInt();
+        int x = settings.value("form_source/left",   (screen.width()  - w) / 2).toInt();
+        int y = settings.value("form_source/top",    (screen.height() - h) / 2).toInt();
+
+        // setGeometry как-то некорректно работает :(
+        resize(w, h);
+        move(x, y);
+
+        Qt::WindowStates state = static_cast<Qt::WindowStates>(settings.value("form_source/state", Qt::WindowNoState).toInt());
+
+        setWindowState(state);
+}
+//----------------------------------------------------------------------------------------------

trunk/form_source_ui.h

@@ -28 +28 @@
         protected:
 
+                /*!
+                 * \brief Функция сохранения расположения и размеров элементов управления формы <при выходе>
+                 */
+                void save ();
+
+                /*!
+                 * \brief Функция восстановления расположения и размеров элементов управления формы <при старте>
+                 */
+                void restore ();
+
                 QVBoxLayout*  m_layout;      /*!< \brief Общий layout        */
                 QTextEdit*    m_text_source; /*!< \brief Raw текст сообщения */

trunk/sysheaders.h

@@ -57 +57 @@
 #include <QTextBrowser>
 #include <QIntValidator>
+#include <QDesktopWidget>
 #include <QCalendarWidget>
 #include <QDesktopServices>

trunk/version.h

@@ -20 +20 @@
  * \brief Дата билда (заменяется автоматически при каждом билде в version.h, что и приводит к смене номера ревизии)
  */
-#define AVALON_DATE "Сбт Мар 21 22:41:28 MSK 2009"
+#define AVALON_DATE "Вск Мар 22 04:04:36 MSK 2009"
 
 #endif