Mercurial > repos > IBBoard.WarFoundry.GUI.QtSharp
changeset 12:4a724378d66a
Re #247: Implement menu options in Qt# app
* Hook up army close (can now create, save and close armies)
Re #242: Create Qt# UI for WarFoundry
* Fix initial window title
author | IBBoard <dev@ibboard.co.uk> |
---|---|
date | Fri, 05 Feb 2010 20:57:44 +0000 |
parents | 72bcf6457227 |
children | dbe784f0802c |
files | MainWindow.cs qt-gui/MainWindowLayout.cs qt-gui/MainWindowLayout.ui |
diffstat | 3 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/MainWindow.cs Fri Feb 05 20:37:30 2010 +0000 +++ b/MainWindow.cs Fri Feb 05 20:57:44 2010 +0000 @@ -29,6 +29,7 @@ layout = new Ui_MainWindowLayout(); layout.SetupUi(this); WindowIcon = new QIcon("icons/App.png"); + SetAppTitle(); saveArmyDialog = new QFileDialog(this); saveArmyDialog.acceptMode = QFileDialog.AcceptMode.AcceptSave; SetUpActionIcons(); @@ -60,6 +61,7 @@ QObject.Connect(layout.actionRedo, SIGNAL("triggered()"), RedoAction); QObject.Connect(layout.actionSaveArmyAs, SIGNAL("triggered()"), DoSaveCurrentArmyAs); QObject.Connect(layout.actionSaveArmy, SIGNAL("triggered()"), DoSaveCurrentArmy); + QObject.Connect(layout.actionCloseArmy, SIGNAL("triggered()"), CloseArmy); } private void CreateNewArmy() @@ -361,5 +363,10 @@ { //TODO enable category buttons } + + private void CloseArmy() + { + CurrentArmy = null; + } } } \ No newline at end of file
--- a/qt-gui/MainWindowLayout.cs Fri Feb 05 20:37:30 2010 +0000 +++ b/qt-gui/MainWindowLayout.cs Fri Feb 05 20:57:44 2010 +0000 @@ -1,8 +1,8 @@ /******************************************************************************** ** Form generated from reading ui file 'MainWindowLayout.ui' ** -** Created: Sat Jan 23 19:54:08 2010 -** by: Qt User Interface Compiler for C# version 4.5.3 +** Created: Fri Feb 5 20:56:11 2010 +** by: Qt User Interface Compiler for C# version 4.6.0 ** ** WARNING! All changes made in this file will be lost when recompiling ui file! ********************************************************************************/ @@ -121,7 +121,6 @@ toolBar.ObjectName = "toolBar"; toolBar.ToolButtonStyle = Qt.ToolButtonStyle.ToolButtonIconOnly; MainWindowLayout.AddToolBar(Qt.ToolBarArea.TopToolBarArea, toolBar); - MainWindowLayout.InsertToolBarBreak(toolBar); menubar.AddAction(menuFile.MenuAction()); menubar.AddAction(menuEdit.MenuAction()); @@ -152,7 +151,7 @@ public void RetranslateUi(QMainWindow MainWindowLayout) { - MainWindowLayout.WindowTitle = QApplication.Translate("MainWindowLayout", "MainWindow", null, QApplication.Encoding.UnicodeUTF8); + MainWindowLayout.WindowTitle = QApplication.Translate("MainWindowLayout", "WarFoundry", null, QApplication.Encoding.UnicodeUTF8); actionCreateArmy.Text = QApplication.Translate("MainWindowLayout", "&create army", null, QApplication.Encoding.UnicodeUTF8); actionOpenArmy.Text = QApplication.Translate("MainWindowLayout", "&open army", null, QApplication.Encoding.UnicodeUTF8); actionSaveArmy.Text = QApplication.Translate("MainWindowLayout", "&save army", null, QApplication.Encoding.UnicodeUTF8);
--- a/qt-gui/MainWindowLayout.ui Fri Feb 05 20:37:30 2010 +0000 +++ b/qt-gui/MainWindowLayout.ui Fri Feb 05 20:57:44 2010 +0000 @@ -11,7 +11,7 @@ </rect> </property> <property name="windowTitle"> - <string>MainWindow</string> + <string>WarFoundry</string> </property> <property name="windowIcon"> <iconset> @@ -115,7 +115,7 @@ <enum>TopToolBarArea</enum> </attribute> <attribute name="toolBarBreak"> - <bool>true</bool> + <bool>false</bool> </attribute> </widget> <action name="actionCreateArmy">