[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Eliot-dev] eliot/qt main_window.cpp ui/main_window.ui ui/n...
From: |
Olivier Teulière |
Subject: |
[Eliot-dev] eliot/qt main_window.cpp ui/main_window.ui ui/n... |
Date: |
Thu, 15 Jan 2009 20:22:12 +0000 |
CVSROOT: /cvsroot/eliot
Module name: eliot
Changes by: Olivier Teulière <ipkiss> 09/01/15 20:22:12
Modified files:
qt : main_window.cpp
qt/ui : main_window.ui new_game.ui
Log message:
- Use splitters to allow the user to resize freely the components of
the main window
- Save splitters positions from one session to the next
- Fixed default focus issues introduced in the previous commit
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/main_window.cpp?cvsroot=eliot&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/ui/main_window.ui?cvsroot=eliot&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/ui/new_game.ui?cvsroot=eliot&r1=1.4&r2=1.5
Patches:
Index: main_window.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/qt/main_window.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- main_window.cpp 14 Dec 2008 13:27:00 -0000 1.26
+++ main_window.cpp 15 Jan 2009 20:22:11 -0000 1.27
@@ -331,6 +331,8 @@
settings.beginGroup(m_windowName);
settings.setValue("size", size());
settings.setValue("pos", pos());
+ settings.setValue("splitterHoriz", m_ui.splitterHoriz->saveState());
+ settings.setValue("splitterVert", m_ui.splitterVert->saveState());
settings.endGroup();
}
@@ -343,6 +345,8 @@
if (size.isValid())
resize(size);
move(settings.value("pos", QPoint(200, 200)).toPoint());
+
m_ui.splitterHoriz->restoreState(settings.value("splitterHoriz").toByteArray());
+
m_ui.splitterVert->restoreState(settings.value("splitterVert").toByteArray());
settings.endGroup();
}
Index: ui/main_window.ui
===================================================================
RCS file: /cvsroot/eliot/eliot/qt/ui/main_window.ui,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- ui/main_window.ui 14 Dec 2008 13:27:02 -0000 1.14
+++ ui/main_window.ui 15 Jan 2009 20:22:11 -0000 1.15
@@ -17,10 +17,16 @@
<normaloff>:/images/eliot.xpm</normaloff>:/images/eliot.xpm</iconset>
</property>
<widget class="QWidget" name="centralwidget" >
- <layout class="QVBoxLayout" >
- <item>
- <layout class="QHBoxLayout" >
+ <layout class="QVBoxLayout" name="verticalLayout_2" >
<item>
+ <widget class="QSplitter" name="splitterHoriz" >
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <widget class="QSplitter" name="splitterVert" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
<widget class="QGroupBox" name="groupBoxTest" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
@@ -32,8 +38,6 @@
<string>_("Board")</string>
</property>
</widget>
- </item>
- <item>
<widget class="QGroupBox" name="groupBoxHistory" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
@@ -45,18 +49,17 @@
<string>_("History")</string>
</property>
</widget>
- </item>
- </layout>
- </item>
- <item>
+ </widget>
<widget class="QGroupBox" name="groupBoxPlayers" >
<property name="title" >
<string>_("Players")</string>
</property>
<layout class="QHBoxLayout" />
</widget>
+ </widget>
</item>
</layout>
+ <zorder>splitterHoriz</zorder>
</widget>
<widget class="QMenuBar" name="menubar" >
<property name="geometry" >
Index: ui/new_game.ui
===================================================================
RCS file: /cvsroot/eliot/eliot/qt/ui/new_game.ui,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ui/new_game.ui 15 Jan 2009 18:33:33 -0000 1.4
+++ ui/new_game.ui 15 Jan 2009 20:22:11 -0000 1.5
@@ -242,18 +242,6 @@
</item>
</layout>
</widget>
- <tabstops>
- <tabstop>buttonBox</tabstop>
- <tabstop>comboBoxMode</tabstop>
- <tabstop>checkBoxJoker</tabstop>
- <tabstop>checkBoxExplosive</tabstop>
- <tabstop>treeViewPlayers</tabstop>
- <tabstop>lineEditName</tabstop>
- <tabstop>comboBoxType</tabstop>
- <tabstop>spinBoxLevel</tabstop>
- <tabstop>pushButtonAdd</tabstop>
- <tabstop>pushButtonRemove</tabstop>
- </tabstops>
<resources/>
<connections>
<connection>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Eliot-dev] eliot/qt main_window.cpp ui/main_window.ui ui/n...,
Olivier Teulière <=