Changeset 350

Timestamp:

08/10/10 04:24:45 (18 months ago)

Author:

antonbatenev.ya.ru

Message:

fix #5 - резиновая форма выбора даты/времени

Location:

trunk

Files:

• form_date_ui.cpp (modified) (1 diff)
• form_date_ui.h (modified) (1 diff)
• version.h (modified) (1 diff)

trunk/form_date_ui.cpp

@@ -26 +26 @@
         setWindowIcon(icon);
 
-        resize(315, 275);
+        resize(300, 220);
         setFixedSize(width(), height());
 
         m_layout = new QHBoxLayout(this);
 
-        m_groupbox_calendar = new QGroupBox(this);
-        m_groupbox_calendar->setTitle(QString::fromUtf8("дата / время"));
-        m_layout->addWidget(m_groupbox_calendar);
+        m_calendar_layout = new QVBoxLayout();
+        m_layout->addLayout(m_calendar_layout);
 
-        m_frame_calendar = new QFrame(m_groupbox_calendar);
+        m_button_layout = new QVBoxLayout();
+        m_layout->addLayout(m_button_layout);
 
-        #ifndef Q_WS_WIN
-                m_frame_calendar->setFrameShadow(QFrame::Plain);
-        #endif
-
-        m_frame_calendar->setGeometry(QRect(10, 22, 190, 220));
-
-        m_layout_widget = new QWidget(m_frame_calendar);
-        m_layout_widget->setGeometry(QRect(2, 2, m_frame_calendar->width() - 4, m_frame_calendar->height() - 4));
-
-        m_calendar_layout = new QVBoxLayout(m_layout_widget);
-        m_calendar_layout->setContentsMargins(0, 0, 0, 0);
-
-        m_text_date = new QCalendarWidget(m_layout_widget);
-
+        m_text_date = new QCalendarWidget(this);
+        m_text_date->setFirstDayOfWeek(Qt::Monday);
+        m_text_date->setVerticalHeaderFormat(QCalendarWidget::NoVerticalHeader);
+        m_text_date->setGridVisible(true);
         m_calendar_layout->addWidget(m_text_date);
 
-        m_text_time = new QTimeEdit(m_layout_widget);
+        m_text_time = new QTimeEdit(this);
         m_text_time->setButtonSymbols(QAbstractSpinBox::UpDownArrows);
-
         m_calendar_layout->addWidget(m_text_time);
 
-        m_button_ok = new QPushButton(m_groupbox_calendar);
+        m_button_ok = new QPushButton(this);
         m_button_ok->setText(QString::fromUtf8("OK"));
         m_button_ok->setShortcut(QKeySequence("Return"));
         m_button_ok->setDefault(true);
-        m_button_ok->setGeometry(QRect(207, 22, 75, 26));
+        m_button_layout->addWidget(m_button_ok);
 
-        m_button_cancel = new QPushButton(m_groupbox_calendar);
+        m_button_cancel = new QPushButton(this);
         m_button_cancel->setText(QString::fromUtf8("Отмена"));
         m_button_cancel->setShortcut(QKeySequence("Esc"));
-        m_button_cancel->setGeometry(QRect(207, 57, 75, 26));
+        m_button_layout->addWidget(m_button_cancel);
+
+        m_spacer_button = new QSpacerItem(1, height(), QSizePolicy::Maximum, QSizePolicy::Expanding);
+        m_button_layout->addItem(m_spacer_button);
 }
 //----------------------------------------------------------------------------------------------

trunk/form_date_ui.h

@@ -28 +28 @@
         protected:
 
-                QPushButton* m_button_ok;         /*!< \brief OK     */
-                QPushButton* m_button_cancel;     /*!< \brief Отмена */
-
-                QGroupBox* m_groupbox_calendar;   /*!< \brief Рамка для календаря и даты */
-                QFrame*    m_frame_calendar;      /*!< \brief Рамка для календаря        */
-
-                QWidget*         m_layout_widget; /*!< \brief Виджет для календаря и времени */
-                QCalendarWidget* m_text_date;     /*!< \brief Календарь */
-                QTimeEdit*       m_text_time;     /*!< \brief Время     */
-
-                QHBoxLayout* m_layout;            /*!< \brief Общий layout         */
-                QVBoxLayout* m_calendar_layout;   /*!< \brief Layout для календаря */
-                QVBoxLayout* m_button_layout;     /*!< \brief Layout для кнопок    */
+                QHBoxLayout* m_layout;                  /*!< \brief Общий layout         */
+                   QVBoxLayout* m_calendar_layout;      /*!< \brief Layout для календаря */
+                      QCalendarWidget* m_text_date;     /*!< \brief Календарь            */
+                      QTimeEdit*       m_text_time;     /*!< \brief Время                */
+                   QVBoxLayout* m_button_layout;        /*!< \brief Layout для кнопок    */
+                      QPushButton* m_button_ok;         /*!< \brief OK                   */
+                      QPushButton* m_button_cancel;     /*!< \brief Отмена               */
+                      QSpacerItem* m_spacer_button;     /*!< \brief Выравнивание кнопок  */
 };
 

trunk/version.h

@@ -20 +20 @@
  * \brief Дата билда (заменяется автоматически при каждом билде в version.h, что и приводит к смене номера ревизии)
  */
-#define AVALON_DATE "Втр Авг  3 20:13:10 MSD 2010"
+#define AVALON_DATE "Втр Авг  3 23:05:10 MSD 2010"
 
 #endif