From b69214d555a2a06a004f92cf8c52160ee52b82dc Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Thu, 27 Sep 2001 19:13:27 +0000 Subject: [PATCH] The last commit before backup --- bs/bsview.cpp | 3 + bs/bsview.h | 2 + bs/main.cpp | 6 + bs/ui/bsappbase.ui | 9 +- bs/ui/fleetviewbase.ui | 1173 ++++++++++++++++---------------------- bs/ui/fleetviewbase.ui.h | 6 +- hbs.kdevprj | 12 +- hbs.kdevses | 2 +- hbs.pro | 3 +- 9 files changed, 512 insertions(+), 704 deletions(-) diff --git a/bs/bsview.cpp b/bs/bsview.cpp index 042adf7..76d812f 100644 --- a/bs/bsview.cpp +++ b/bs/bsview.cpp @@ -21,6 +21,7 @@ #include "scanview.h" #include "ui/infoview.h" #include "tickview.h" +#include "ui/fleetviewbase.h" //QT includes #include @@ -52,6 +53,8 @@ BSView::BSView(QWidget *parent, BSDoc *doc) : QSplitter(parent) //the widget stack m_BattleSum = new BattleSum(); m_FleetViews->addWidget(m_BattleSum, 0); + m_FleetView = new FleetViewBase(); + m_FleetViews->addWidget(m_FleetView, 1); //m_FleetViews->raiseWidget(0); connect(m_NumberView, SIGNAL(selectionChanged(QListViewItem *)), SLOT(slotFleetSelection(QListViewItem *))); diff --git a/bs/bsview.h b/bs/bsview.h index c90b210..da4f562 100644 --- a/bs/bsview.h +++ b/bs/bsview.h @@ -28,6 +28,7 @@ class BattleSum; class ScanView; class InfoView; class TickView; +class FleetViewBase; //QT forward declarations class QListView; @@ -60,6 +61,7 @@ class BSView : public QSplitter InfoView *m_InfoView; TickView *m_TickView; QWidgetStack *m_FleetViews; + FleetViewBase *m_FleetView; public slots: // Public slots /** No descriptions */ diff --git a/bs/main.cpp b/bs/main.cpp index e919592..d62cf3f 100644 --- a/bs/main.cpp +++ b/bs/main.cpp @@ -18,6 +18,8 @@ #include #include #include +#include +#include #include "../config.h" #include "bs.h" @@ -25,8 +27,12 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); + a.setStyle(new QPlatinumStyle); //QStyle* s = new QCDEStyle(); + //QTranslator translator( 0 ); + //translator.load( "se_SE.qm", "/home/whale/src/hbs" ); + //a.installTranslator( &translator ); a.setFont(QFont("times", 12)); /* uncomment the following line, if you want a Windows 95 look*/ diff --git a/bs/ui/bsappbase.ui b/bs/ui/bsappbase.ui index 0c34bec..f2714b5 100644 --- a/bs/ui/bsappbase.ui +++ b/bs/ui/bsappbase.ui @@ -20,6 +20,14 @@ menubar + + + 0 + 0 + 726 + 30 + + @@ -59,7 +67,6 @@ - diff --git a/bs/ui/fleetviewbase.ui b/bs/ui/fleetviewbase.ui index a736d64..84fa863 100644 --- a/bs/ui/fleetviewbase.ui +++ b/bs/ui/fleetviewbase.ui @@ -8,739 +8,530 @@ 0 0 - 600 - 480 + 605 + 332 Form1 - + - Layout13 + unnamed - - - 308 - 11 - 281 - 344 - + + 11 - + + 6 + + - unnamed - - - 0 + CaptureBox - - 6 + + Captured roids - - - Layout12 - - - - unnamed - - - 0 - - - 6 - - - - Layout11 - - - - unnamed - - - 0 - - - 6 - - - - TextLabel15 - - - Name - - - - - TextLabel16 - - - Total - - - - - TextLabel17 - - - L/S - - - - - - - Layout8 - - - - unnamed - - - 0 - - - 6 - - - - Layout2 - - - - unnamed - - - 0 - - - 6 - - - - SpiderLabel - - - Spider - - - - - WraithLabel - - - Wraith - - - - - BlackWidowLabel - - - BlackWidow - - - - - TextLabel9 - - - TextLabel9 - - - - - TextLabel10 - - - TextLabel10 - - - - - - - Layout7 - - - - unnamed - - - 0 - - - 6 - - - - LineEdit1_2 - - - - - LineEdit2_2 - - - - - LineEdit3_2 - - - - - LineEdit4_2 - - - - - LineEdit5_2 - - - - - - - Layout6 - - - - unnamed - - - 0 - - - 6 - - - - LineEdit7_2 - - - - - LineEdit8_2 - - - - - LineEdit9_2 - - - - - LineEdit10_2 - - - - - LineEdit11_2 - - - true - - - - - - - - - + - Spacer2 + unnamed - - Vertical + + 11 - - Expanding + + 6 - - - 20 - 20 - - - - - - - - Spacer1 - - - Horizontal - - - Expanding - - - - 20 - 20 - - - - - - Layout15 - - - - 11 - 11 - 284 - 305 - - - + + + TextLabel18 + + + Metal + + + + + LineEdit23 + + + NoFocus + + + true + + + + + TextLabel19 + + + Crystal + + + + + LineEdit24 + + + NoFocus + + + true + + + + + TextLabel20 + + + Eonium + + + + + LineEdit25 + + + NoFocus + + + true + + + + + - unnamed + Spacer4 - - 0 + + Vertical - - 6 + + Expanding - - - Layout10 - - - - unnamed - - - 0 - - - 6 - - - - Layout9 - - - - unnamed - - - 0 - - - 6 - - - - TextLabel12 - - - Name - - - - - TextLabel13 - - - Total - - - - - TextLabel14 - - - L/S - - - - - - - Layout5 - - - - unnamed - - - 0 - - - 6 - - - - Layout1 - - - - unnamed - - - 0 - - - 6 - - - - InterceptorLabel - - - Interceptor - - - - - PheonixLabel - - - Pheonix - - - - - WarfrigateLabel - - - Warfrigate - - - - - DevistatorLabel - - - Devistator - - - - - StarCruiserLabel - - - StarCruiser - - - - - DreadnaughLabel - - - Dreadnaught - - - - - - - Layout3 - - - - unnamed - - - 0 - - - 6 - - - - LineEdit1 - - - - - LineEdit2 - - - - - LineEdit3 - - - - - LineEdit4 - - - - - LineEdit5 - - - - - LineEdit6 - - - - - - - Layout4 - - - - unnamed - - - 0 - - - 6 - - - - LineEdit7 - - - - - LineEdit8 - - - - - LineEdit9 - - - - - LineEdit10 - - - - - LineEdit11 - - - - - LineEdit12 - - - - - - - - - - - Spacer4 - - - Vertical - - - Expanding - - - - 20 - 20 - - - - - - - - CaptureBox - - - - 11 - 361 - 578 - 51 - - - - Captured roids - - + + + 20 + 20 + + + + - unnamed + Spacer2 - - 11 + + Vertical - - 6 + + Expanding - - - TextLabel18 - - - Metal - - - - - LineEdit23 - - - true - - - + + + 20 + 20 + + + + + + Layout16 + + - TextLabel19 + unnamed - - Crystal + + 0 - - - - LineEdit24 + + 6 - - true - - - + + + LineEdit9_2 + + + NoFocus + + + true + + + + + LineEdit3_2 + + + + + LineEdit1_2 + + + + + BlackWidowLabel + + + BlackWidow + + + + + SpiderLabel + + + Spider + + + + + LineEdit10_2 + + + NoFocus + + + true + + + + + LineEdit4_2 + + + + + WraithLabel + + + Wraith + + + + + LineEdit7_2 + + + NoFocus + + + true + + + + + TextLabel17 + + + L/S + + + + + TextLabel15 + + + Name + + + + + LineEdit2_2 + + + + + SpectreLabel + + + Spectre + + + + + LineEdit5_2 + + + + + TextLabel16 + + + Total + + + + + LineEdit8_2 + + + NoFocus + + + true + + + + + LineEdit11_2 + + + NoFocus + + + true + + + + + TarantulaLabel + + + Tarantula + + + + + + + Layout15 + + - TextLabel20 - - - Eonium + unnamed - - - - LineEdit25 + + 0 - - true + + 6 - - - - - - SalvageBox - - - - 11 - 418 - 578 - 51 - - - - Salvage - - + + + TextLabel13 + + + Total + + + + + LineEdit3 + + + + + TextLabel12 + + + Name + + + + + LineEdit12 + + + NoFocus + + + true + + + + + LineEdit6 + + + + + LineEdit2 + + + + + TextLabel14 + + + L/S + + + + + LineEdit8 + + + NoFocus + + + true + + + + + WarfrigateLabel + + + Warfrigate + + + + + DevistatorLabel + + + Devistator + + + + + LineEdit9 + + + NoFocus + + + true + + + + + LineEdit4 + + + + + StarCruiserLabel + + + StarCruiser + + + + + PheonixLabel + + + Pheonix + + + + + LineEdit10 + + + NoFocus + + + true + + + + + LineEdit1 + + + + + DreadnaughLabel + + + Dreadnaught + + + + + LineEdit5 + + + + + LineEdit7 + + + NoFocus + + + true + + + + + LineEdit11 + + + NoFocus + + + true + + + + + InterceptorLabel + + + Interceptor + + + + + - unnamed + Spacer1 - - 11 + + Horizontal - - 6 + + Expanding - - - TextLabel18_2 - - - Metal - - - - - LineEdit23_2 - - - true - - - - - TextLabel19_2 - - - Crystal - - - - - LineEdit24_2 - - - true - - - - - TextLabel20_2 - - - Eonium - - - - - LineEdit25_2 - - - true - - - - - - - PushButton1 - - - - 170 - 330 - 80 - 25 - - - - PushButton1 - - - true - - - true - - + + + 20 + 20 + + + + - - PushButton1 - toggled(bool) - FleetViewBase - slotAttacker(bool) - + + LineEdit1 + LineEdit2 + LineEdit3 + LineEdit4 + LineEdit5 + LineEdit6 + LineEdit1_2 + LineEdit2_2 + LineEdit3_2 + LineEdit4_2 + LineEdit5_2 + LineEdit8 + LineEdit23 + LineEdit24 + LineEdit25 + LineEdit7 + LineEdit9 + LineEdit10 + LineEdit11 + LineEdit12 + LineEdit7_2 + LineEdit8_2 + LineEdit9_2 + LineEdit10_2 + LineEdit11_2 + fleetviewbase.ui.h - slotAttacker( bool b ) + slotAttacker(bool b) diff --git a/bs/ui/fleetviewbase.ui.h b/bs/ui/fleetviewbase.ui.h index 89d1385..05111a4 100644 --- a/bs/ui/fleetviewbase.ui.h +++ b/bs/ui/fleetviewbase.ui.h @@ -11,12 +11,10 @@ void FleetViewBase::slotAttacker(bool b) { if (b) { - CaptureBox->show(); - SalvageBox->hide(); + CaptureBox->setCaption("Captured roids"); } else { - SalvageBox->show(); - CaptureBox->hid(); + CaptureBox->setCaption("Salvage"); } } \ No newline at end of file diff --git a/hbs.kdevprj b/hbs.kdevprj index 2f0679d..2a0fbc8 100644 --- a/hbs.kdevprj +++ b/hbs.kdevprj @@ -91,37 +91,37 @@ files=bs/bs.cpp,bs/bs.h,bs/bsdoc.cpp,bs/bsdoc.h,bs/bsview.cpp,bs/bsview.h,bs/mai sub_dirs= type=prog_main -[bs/bs.cpp] +[bs/battlesum.cpp] dist=true install=false install_location= type=SOURCE -[bs/bs.h] +[bs/battlesum.h] dist=true install=false install_location= type=HEADER -[bs/bsdoc.cpp] +[bs/bs.cpp] dist=true install=false install_location= type=SOURCE -[bs/bsdoc.h] +[bs/bs.h] dist=true install=false install_location= type=HEADER -[bs/battlesum.cpp] +[bs/bsdoc.cpp] dist=true install=false install_location= type=SOURCE -[bs/battlesum.h] +[bs/bsdoc.h] dist=true install=false install_location= diff --git a/hbs.kdevses b/hbs.kdevses index e0922ee..7d79bcf 100644 --- a/hbs.kdevses +++ b/hbs.kdevses @@ -2,7 +2,7 @@ - + diff --git a/hbs.pro b/hbs.pro index 565dabc..99b2154 100644 --- a/hbs.pro +++ b/hbs.pro @@ -4,7 +4,8 @@ HEADERS += bs/bs.h bs/bsdoc.h bs/bsview.h bs/battlesum.h config.h bs/scanview.h TARGET = bs/bs IMAGEFILE = images.cpp PROJECTNAME = BS -FORMS = bs/ui/battlesumbase.ui bs/ui/scanviewbase.ui bs/ui/infoview.ui bs/ui/tickviewbase.ui bs/ui/bsappbase.ui +TRANSLATIONS = sv_SE.ts +FORMS = bs/ui/battlesumbase.ui bs/ui/scanviewbase.ui bs/ui/infoview.ui bs/ui/tickviewbase.ui bs/ui/bsappbase.ui bs/ui/fleetviewbase.ui TEMPLATE =app CONFIG += qt warn_on debug thread DBFILE = hbs.db -- 2.39.2