some minor ui changes

diff --git a/bs/bsdoc.cpp b/bs/bsdoc.cpp
index e3e046986418caaad4d4147646c393fbe2fb293b..f26e7e4d66a83104368eb41af05bcc5c1e1f74eb 100644 (file)
--- a/bs/bsdoc.cpp
+++ b/bs/bsdoc.cpp
@@ -59,6 +59,7 @@ int BSDoc::newBattle(QString name)
        m_Battles[name]["Friendly"]["Home Planet"];
        m_Battles[name]["Hostile"];
 
+       modified = true;
        emit documentChanged();
        return 0;
 }

diff --git a/bs/bsdoc.h b/bs/bsdoc.h
index eac45f40432b1a62ee0865ba64d3a8961d07f9a0..3cca9c34290db51fdbe32578c210e48c21e44787 100644 (file)
--- a/bs/bsdoc.h
+++ b/bs/bsdoc.h
@@ -66,6 +66,13 @@ class BSDoc : public QObject
   protected:
     bool modified;
 
+       /**This is the main datastructure of the battlecalc, it's more or less the
+        * core that everything else works around. A short explanation of the fields:
+        * -# The name of the battle (usually coordinates)
+        * -# The name of the group (ie. Friendly/Hostile)
+        * -# The fleetname (Home Planet, coordinates, irc nicks and so on)
+        * - and in the end you got the actual Fleet object with it's data.
+        */
        std::map<QString, std::map<QString, std::map<QString, Fleet> > > m_Battles;
 };
 

diff --git a/bs/bsview.cpp b/bs/bsview.cpp
index 9af428df1fed72e90c88ebc4599c2e6521c7de81..1906dda16732358ee4452f3be5b00c6e0b99469f 100644 (file)
--- a/bs/bsview.cpp
+++ b/bs/bsview.cpp
@@ -48,10 +48,11 @@ BSView::BSView(QWidget *parent, BSDoc *doc) : QSplitter(parent)
 
        //setting up the listview
        m_NumberView = new QListView(m_LeftSplit);
+       m_NumberView->setRootIsDecorated(true);  
        m_NumberView->addColumn("Name");
        m_NumberView->addColumn("Number");
        m_NumberView->addColumn("ETA");
-       addBattle("test");
+       //addBattle("NO BATTLES");
 
        m_InfoView = new InfoView(m_LeftSplit);
        
@@ -79,8 +80,8 @@ BSView::~BSView()
 void BSView::addBattle(QString name)
 {
        QListViewItem* battle = new QListViewItem(m_NumberView, name);
-       QListViewItem* def = new QListViewItem(battle, tr("Defenders"),"", "","1");
-       (void) new QListViewItem(battle, tr("Attackers"),"", "","2");
+       QListViewItem* def = new QListViewItem(battle, tr("Friendly"),"", "","1");
+       (void) new QListViewItem(battle, tr("Hostile"),"", "","2");
        (void) new QListViewItem(def, tr("Home Planet"), "","","1");
 }
 

diff --git a/bs/docs/devel/main.doc b/bs/docs/devel/main.doc
index 37f70f7cf7d391cfb1872bb28ecfdcb2d45f4f4f..fbdf068964aef3af2f859b5eb5487e4fd5e2b65f 100644 (file)
--- a/bs/docs/devel/main.doc
+++ b/bs/docs/devel/main.doc
@@ -2,6 +2,6 @@
   \section intro Introduction
   Going to write something nice here.. (maybe ;)
   \section cvs Getting CVS access
-  Yes I got anonymous cvs access, might right how you reach it one day.. ;)
+  Yes I got anonymous cvs access, might write how you reach it one day.. ;)
 
  */

diff --git a/bs/ui/bsappbase.ui b/bs/ui/bsappbase.ui
index fa0d859239421cae44553de64c051fa872ab6ee5..363fc7e16b44f1f3d1003c04367dc77052f97a48 100644 (file)
--- a/bs/ui/bsappbase.ui
+++ b/bs/ui/bsappbase.ui
@@ -13,7 +13,7 @@
         </rect>
     </property>
     <property name="caption">
-        <string>Form1</string>
+        <string>Harvalen's Battlesystem</string>
     </property>
 </widget>
 <menubar>
@@ -48,15 +48,15 @@
         <separator/>
         <action name="editFindAction"/>
     </item>
+    <item text="Battle" name="PopupMenu">
+        <action name="battleNewAction"/>
+    </item>
     <item text="&amp;Help" name="helpMenu">
         <action name="helpContentsAction"/>
         <action name="helpIndexAction"/>
         <separator/>
         <action name="helpAboutAction"/>
     </item>
-    <item text="Battle" name="PopupMenu">
-        <action name="battleNewAction"/>
-    </item>
 </menubar>
 <toolbars>
     <toolbar dock="2">
@@ -319,6 +319,12 @@
         <property name="text">
             <string>New</string>
         </property>
+        <property name="toolTip">
+            <string>Create what's needed to add fleets to a battle</string>
+        </property>
+        <property name="statusTip">
+            <string>Create a new battle with initial groups and home planet</string>
+        </property>
         <property name="accel">
             <number>4194382</number>
         </property>