frogface-patches Mailing List for Frogface
Status: Planning
Brought to you by:
declanmcgrath
Menu
▾
▴
frogface-patches — Email updates of each changeset (as diffs) commited to the frogface codebase
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(4) |
Jun
(2) |
Jul
(5) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: <dec...@us...> - 2007-07-12 10:28:50
|
Revision: 34
http://frogface.svn.sourceforge.net/frogface/?rev=34&view=rev
Author: declanmcgrath
Date: 2007-07-12 03:28:42 -0700 (Thu, 12 Jul 2007)
Log Message:
-----------
Made 'New' button clear any pics from the list. Not sure if this is
the best behaviour but it's better than how it was. Perhaps it would be
better to disable the CrudPanel on the Pics tab altogether as it
could confuse the user.
Also, added New/Delete buttons to Gallery.
Modified Paths:
--------------
trunk/bin/data/debug_info/location_DEBUG_INNER.xml
trunk/bin/data/locationlist.xml
trunk/bin/data/sequencenumbers.xml
trunk/bin/frogface
trunk/frogface.kdevses
trunk/src/crudpanelmanager.cpp
trunk/src/divedashboardwidget.ui
trunk/src/divelistmanager.cpp
trunk/src/enums.h
trunk/src/gallery.cpp
trunk/src/gallery.h
trunk/src/moc_abstractsequentialtablemodel.cpp
trunk/src/moc_browser.cpp
trunk/src/moc_buddylistmanager.cpp
trunk/src/moc_buddytablemodel.cpp
trunk/src/moc_divedashboard.cpp
trunk/src/moc_divelistmanager.cpp
trunk/src/moc_divesitetablemodel.cpp
trunk/src/moc_divetablemodel.cpp
trunk/src/moc_froggiemainwindow.cpp
trunk/src/moc_gallery.cpp
trunk/src/moc_locationlistmanager.cpp
trunk/src/moc_locationtablemodel.cpp
trunk/src/moc_picmanager.cpp
trunk/src/moc_userprofilemanager.cpp
trunk/src/picmanager.cpp
trunk/src/picmanager.h
trunk/src/qrc_resource.cpp
trunk/src/ui_divedashboardwidget.h
Modified: trunk/bin/data/debug_info/location_DEBUG_INNER.xml
===================================================================
--- trunk/bin/data/debug_info/location_DEBUG_INNER.xml 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/bin/data/debug_info/location_DEBUG_INNER.xml 2007-07-12 10:28:42 UTC (rev 34)
@@ -6,16 +6,16 @@
<regionname>Galway</regionname>
<divesitelist>
<divesite>
- <sequenceid>1</sequenceid>
- <locationsequenceid>557</locationsequenceid>
- <name>The Mask</name>
- <description>A great little spot!</description>
- </divesite>
- <divesite>
<sequenceid>2</sequenceid>
<locationsequenceid>0</locationsequenceid>
<name>The Loch</name>
<description>Cold but atmospheric.</description>
</divesite>
+ <divesite>
+ <sequenceid>19</sequenceid>
+ <locationsequenceid>0</locationsequenceid>
+ <name>The Fare</name>
+ <description>Awesome</description>
+ </divesite>
</divesitelist>
</location>
Modified: trunk/bin/data/locationlist.xml
===================================================================
--- trunk/bin/data/locationlist.xml 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/bin/data/locationlist.xml 2007-07-12 10:28:42 UTC (rev 34)
@@ -7,17 +7,17 @@
<regionname>Galway</regionname>
<divesitelist>
<divesite>
- <sequenceid>1</sequenceid>
- <locationsequenceid>557</locationsequenceid>
- <name>The Mask</name>
- <description>A great little spot!</description>
- </divesite>
- <divesite>
<sequenceid>2</sequenceid>
<locationsequenceid>0</locationsequenceid>
<name>The Loch</name>
<description>Cold but atmospheric.</description>
</divesite>
+ <divesite>
+ <sequenceid>19</sequenceid>
+ <locationsequenceid>0</locationsequenceid>
+ <name>The Fare</name>
+ <description>Awesome</description>
+ </divesite>
</divesitelist>
</location>
<location>
Modified: trunk/bin/data/sequencenumbers.xml
===================================================================
--- trunk/bin/data/sequencenumbers.xml 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/bin/data/sequencenumbers.xml 2007-07-12 10:28:42 UTC (rev 34)
@@ -1,8 +1,7 @@
<!DOCTYPE none>
<sequencenumbermanager>
<divesequencenumber>2</divesequencenumber>
- <diveimagesequencenumber>0</diveimagesequencenumber>
<regionsequencenumber>5</regionsequencenumber>
- <divesitesequencenumber>12</divesitesequencenumber>
+ <divesitesequencenumber>19</divesitesequencenumber>
<countrysequencenumber>7</countrysequencenumber>
</sequencenumbermanager>
Modified: trunk/bin/frogface
===================================================================
(Binary files differ)
Modified: trunk/frogface.kdevses
===================================================================
--- trunk/frogface.kdevses 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/frogface.kdevses 2007-07-12 10:28:42 UTC (rev 34)
@@ -1,126 +1,30 @@
<?xml version = '1.0' encoding = 'UTF-8'?>
<!DOCTYPE KDevPrjSession>
<KDevPrjSession>
- <DocsAndViews NumberOfDocuments="37" >
- <Doc0 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/location.h" >
- <View0 Type="Source" />
+ <DocsAndViews NumberOfDocuments="5" >
+ <Doc0 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/gallery.cpp" >
+ <View0 line="100" Type="Source" />
</Doc0>
- <Doc1 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/gallery.h" >
- <View0 line="30" Type="Source" />
+ <Doc1 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divelistmanager.h" >
+ <View0 line="52" Type="Source" />
</Doc1>
- <Doc2 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/gallery.cpp" >
- <View0 line="65" Type="Source" />
+ <Doc2 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divelistmanager.cpp" >
+ <View0 line="183" Type="Source" />
</Doc2>
- <Doc3 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/picmanager.h" >
- <View0 line="70" Type="Source" />
+ <Doc3 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/locationlistmanager.h" >
+ <View0 line="50" Type="Source" />
</Doc3>
- <Doc4 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/picmanager.cpp" >
- <View0 line="47" Type="Source" />
+ <Doc4 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/locationlistmanager.cpp" >
+ <View0 line="182" Type="Source" />
</Doc4>
- <Doc5 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divelistmanager.h" >
- <View0 line="0" Type="Source" />
- </Doc5>
- <Doc6 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divelistmanager.cpp" >
- <View0 line="297" Type="Source" />
- </Doc6>
- <Doc7 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divedashboard.h" >
- <View0 Type="Source" />
- </Doc7>
- <Doc8 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divedashboard.cpp" >
- <View0 Type="Source" />
- </Doc8>
- <Doc9 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/abstractrecordlistmanager.cpp" >
- <View0 Type="Source" />
- </Doc9>
- <Doc10 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/src/corelib/global/qnamespace.h" >
- <View0 Type="Source" />
- </Doc10>
- <Doc11 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/abstractserialisable.cpp" >
- <View0 Type="Source" />
- </Doc11>
- <Doc12 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/sequencenumbermanager.cpp" >
- <View0 Type="Source" />
- </Doc12>
- <Doc13 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/buddytablemodel.cpp" >
- <View0 Type="Source" />
- </Doc13>
- <Doc14 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divelist.cpp" >
- <View0 Type="Source" />
- </Doc14>
- <Doc15 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/dive.cpp" >
- <View0 line="424" Type="Source" />
- </Doc15>
- <Doc16 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/src/xml/qdom.cpp" >
- <View0 Type="Source" />
- </Doc16>
- <Doc17 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/dive.h" >
- <View0 Type="Source" />
- </Doc17>
- <Doc18 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/convenience.h" >
- <View0 Type="Source" />
- </Doc18>
- <Doc19 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/diveimagelist.cpp" >
- <View0 line="103" Type="Source" />
- </Doc19>
- <Doc20 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/diveimagelist.h" >
- <View0 Type="Source" />
- </Doc20>
- <Doc21 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divesite.h" >
- <View0 Type="Source" />
- </Doc21>
- <Doc22 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divesitelist.h" >
- <View0 Type="Source" />
- </Doc22>
- <Doc23 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divesitelist.cpp" >
- <View0 Type="Source" />
- </Doc23>
- <Doc24 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/diveimage.h" >
- <View0 Type="Source" />
- </Doc24>
- <Doc25 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/abstractimage.h" >
- <View0 Type="Source" />
- </Doc25>
- <Doc26 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/abstractsequentiallist.h" >
- <View0 Type="Source" />
- </Doc26>
- <Doc27 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/buddylist.h" >
- <View0 Type="Source" />
- </Doc27>
- <Doc28 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/tests/testdive/src/testdive.cpp" >
- <View0 Type="Source" />
- </Doc28>
- <Doc29 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/abstractimage.cpp" >
- <View0 Type="Source" />
- </Doc29>
- <Doc30 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/abstractserialisable.h" >
- <View0 Type="Source" />
- </Doc30>
- <Doc31 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/abstractsequentialitem.h" >
- <View0 Type="Source" />
- </Doc31>
- <Doc32 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/abstractrecord.h" >
- <View0 Type="Source" />
- </Doc32>
- <Doc33 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/abstractsequentialitem.cpp" >
- <View0 line="18" Type="Source" />
- </Doc33>
- <Doc34 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/src/corelib/tools/qlist.h" >
- <View0 line="379" Type="Source" />
- </Doc34>
- <Doc35 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/moc_gallery.cpp" >
- <View0 line="54" Type="Source" />
- </Doc35>
- <Doc36 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/projecthelper.h" >
- <View0 line="46" Type="Source" />
- </Doc36>
</DocsAndViews>
<pluginList>
<kdevdebugger>
<breakpointList>
- <breakpoint0 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/gallery.cpp:60" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <breakpoint0 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/gallery.cpp:44" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
<tracedExpressions/>
</breakpoint0>
- <breakpoint1 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/gallery.cpp:125" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <breakpoint1 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divelistmanager.cpp:339" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
<tracedExpressions/>
</breakpoint1>
</breakpointList>
Modified: trunk/src/crudpanelmanager.cpp
===================================================================
--- trunk/src/crudpanelmanager.cpp 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/src/crudpanelmanager.cpp 2007-07-12 10:28:42 UTC (rev 34)
@@ -74,5 +74,8 @@
m_ui_diveDashboard->saveActivityButton->setVisible(true);
m_ui_diveDashboard->cancelActivityButton->setVisible(true);
break;
+ case CrudPanelState_NoButtons:
+ // Do nothing
+ break;
}
}
Modified: trunk/src/divedashboardwidget.ui
===================================================================
--- trunk/src/divedashboardwidget.ui 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/src/divedashboardwidget.ui 2007-07-12 10:28:42 UTC (rev 34)
@@ -718,7 +718,7 @@
</size>
</property>
<property name="currentIndex" >
- <number>3</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="diveBriefTabPage" >
<attribute name="title" >
@@ -1745,7 +1745,7 @@
<widget class="QLabel" name="thumb4" >
<property name="geometry" >
<rect>
- <x>200</x>
+ <x>207</x>
<y>30</y>
<width>50</width>
<height>50</height>
@@ -1761,7 +1761,7 @@
<widget class="QLabel" name="thumb1" >
<property name="geometry" >
<rect>
- <x>20</x>
+ <x>27</x>
<y>30</y>
<width>50</width>
<height>50</height>
@@ -1777,7 +1777,7 @@
<widget class="QLabel" name="thumb2" >
<property name="geometry" >
<rect>
- <x>80</x>
+ <x>87</x>
<y>30</y>
<width>50</width>
<height>50</height>
@@ -1793,7 +1793,7 @@
<widget class="QLabel" name="thumb3" >
<property name="geometry" >
<rect>
- <x>140</x>
+ <x>147</x>
<y>30</y>
<width>50</width>
<height>50</height>
@@ -1858,6 +1858,32 @@
<string><--</string>
</property>
</widget>
+ <widget class="QPushButton" name="addPicButton" >
+ <property name="geometry" >
+ <rect>
+ <x>95</x>
+ <y>89</y>
+ <width>41</width>
+ <height>25</height>
+ </rect>
+ </property>
+ <property name="text" >
+ <string>Add</string>
+ </property>
+ </widget>
+ <widget class="QPushButton" name="deletePicButton" >
+ <property name="geometry" >
+ <rect>
+ <x>147</x>
+ <y>89</y>
+ <width>41</width>
+ <height>25</height>
+ </rect>
+ </property>
+ <property name="text" >
+ <string>Delete</string>
+ </property>
+ </widget>
</widget>
</widget>
<widget class="QWidget" name="locationDetailsTabPage" >
Modified: trunk/src/divelistmanager.cpp
===================================================================
--- trunk/src/divelistmanager.cpp 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/src/divelistmanager.cpp 2007-07-12 10:28:42 UTC (rev 34)
@@ -334,6 +334,9 @@
m_ui_diveDashboard->buddyDiveDetailsCombo->setCurrentIndex(-1);
m_ui_diveDashboard->divemasterEdit->clear();
m_ui_diveDashboard->commentsDiveDetailsEdit->clear();
+
+
+ picManager->clear();
}
/**
Modified: trunk/src/enums.h
===================================================================
--- trunk/src/enums.h 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/src/enums.h 2007-07-12 10:28:42 UTC (rev 34)
@@ -67,6 +67,7 @@
CrudPanelState_ShowCrudButtons_NewEnabledOnly = 2,
CrudPanelState_ShowEditButton = 3,
CrudPanelState_ShowOkCancelButtons = 4,
+ CrudPanelState_NoButtons = 5
};
enum CurrentRecordState
Modified: trunk/src/gallery.cpp
===================================================================
--- trunk/src/gallery.cpp 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/src/gallery.cpp 2007-07-12 10:28:42 UTC (rev 34)
@@ -93,6 +93,14 @@
updateDisplay();
}
+void Gallery::clear()
+{
+ m_activeImageIndex = 0;
+ m_imagenameList.clear();
+ //m_snapshotImage.setPixmap("");
+ m_snapshotImage.clear();
+}
+
void Gallery::init(const AbstractSequentialList& imageList)
{
m_imagenameList.clear();
Modified: trunk/src/gallery.h
===================================================================
--- trunk/src/gallery.h 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/src/gallery.h 2007-07-12 10:28:42 UTC (rev 34)
@@ -57,6 +57,7 @@
void updateDisplay();
void updateDisplayOfPrevNextButtons();
+ void clear();
void reset();
void init(const Data::AbstractSequentialList& imageList);
Modified: trunk/src/moc_abstractsequentialtablemodel.cpp
===================================================================
--- trunk/src/moc_abstractsequentialtablemodel.cpp 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/src/moc_abstractsequentialtablemodel.cpp 2007-07-12 10:28:42 UTC (rev 34)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'abstractsequentialtablemodel.h'
**
-** Created: Sun Jul 1 18:55:12 2007
+** Created: Thu Jul 12 21:50:43 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_browser.cpp
===================================================================
--- trunk/src/moc_browser.cpp 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/src/moc_browser.cpp 2007-07-12 10:28:42 UTC (rev 34)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'browser.h'
**
-** Created: Sun Jul 1 18:56:01 2007
+** Created: Thu Jul 12 21:51:29 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_buddylistmanager.cpp
===================================================================
--- trunk/src/moc_buddylistmanager.cpp 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/src/moc_buddylistmanager.cpp 2007-07-12 10:28:42 UTC (rev 34)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'buddylistmanager.h'
**
-** Created: Sat Jul 7 23:04:24 2007
+** Created: Thu Jul 12 21:51:17 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_buddytablemodel.cpp
===================================================================
--- trunk/src/moc_buddytablemodel.cpp 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/src/moc_buddytablemodel.cpp 2007-07-12 10:28:42 UTC (rev 34)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'buddytablemodel.h'
**
-** Created: Sat Jul 7 23:04:20 2007
+** Created: Thu Jul 12 21:51:14 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_divedashboard.cpp
===================================================================
--- trunk/src/moc_divedashboard.cpp 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/src/moc_divedashboard.cpp 2007-07-12 10:28:42 UTC (rev 34)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divedashboard.h'
**
-** Created: Thu Jul 12 19:58:54 2007
+** Created: Thu Jul 12 21:50:26 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_divelistmanager.cpp
===================================================================
--- trunk/src/moc_divelistmanager.cpp 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/src/moc_divelistmanager.cpp 2007-07-12 10:28:42 UTC (rev 34)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divelistmanager.h'
**
-** Created: Thu Jul 12 19:59:03 2007
+** Created: Thu Jul 12 21:50:47 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_divesitetablemodel.cpp
===================================================================
--- trunk/src/moc_divesitetablemodel.cpp 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/src/moc_divesitetablemodel.cpp 2007-07-12 10:28:42 UTC (rev 34)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divesitetablemodel.h'
**
-** Created: Sat Jul 7 20:04:31 2007
+** Created: Thu Jul 12 21:50:35 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_divetablemodel.cpp
===================================================================
--- trunk/src/moc_divetablemodel.cpp 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/src/moc_divetablemodel.cpp 2007-07-12 10:28:42 UTC (rev 34)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divetablemodel.h'
**
-** Created: Tue Jul 10 19:42:17 2007
+** Created: Thu Jul 12 21:50:22 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_froggiemainwindow.cpp
===================================================================
--- trunk/src/moc_froggiemainwindow.cpp 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/src/moc_froggiemainwindow.cpp 2007-07-12 10:28:42 UTC (rev 34)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'froggiemainwindow.h'
**
-** Created: Sun Jul 1 18:55:36 2007
+** Created: Thu Jul 12 21:51:06 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_gallery.cpp
===================================================================
--- trunk/src/moc_gallery.cpp 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/src/moc_gallery.cpp 2007-07-12 10:28:42 UTC (rev 34)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'gallery.h'
**
-** Created: Thu Jul 12 19:59:14 2007
+** Created: Thu Jul 12 21:51:34 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_locationlistmanager.cpp
===================================================================
--- trunk/src/moc_locationlistmanager.cpp 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/src/moc_locationlistmanager.cpp 2007-07-12 10:28:42 UTC (rev 34)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'locationlistmanager.h'
**
-** Created: Sat Jul 7 20:04:47 2007
+** Created: Thu Jul 12 21:50:54 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_locationtablemodel.cpp
===================================================================
--- trunk/src/moc_locationtablemodel.cpp 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/src/moc_locationtablemodel.cpp 2007-07-12 10:28:42 UTC (rev 34)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'locationtablemodel.h'
**
-** Created: Sat Jul 7 20:04:36 2007
+** Created: Thu Jul 12 21:50:39 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_picmanager.cpp
===================================================================
--- trunk/src/moc_picmanager.cpp 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/src/moc_picmanager.cpp 2007-07-12 10:28:42 UTC (rev 34)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'picmanager.h'
**
-** Created: Thu Jul 12 19:59:09 2007
+** Created: Thu Jul 12 21:51:23 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_userprofilemanager.cpp
===================================================================
--- trunk/src/moc_userprofilemanager.cpp 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/src/moc_userprofilemanager.cpp 2007-07-12 10:28:42 UTC (rev 34)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'userprofilemanager.h'
**
-** Created: Sun Jul 1 18:55:29 2007
+** Created: Thu Jul 12 21:51:00 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/picmanager.cpp
===================================================================
--- trunk/src/picmanager.cpp 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/src/picmanager.cpp 2007-07-12 10:28:42 UTC (rev 34)
@@ -35,6 +35,7 @@
QWidget(parent),
// DiveDashboard member refs (objects)
m_ui_diveDashboard(ui_diveDashboard),
+ m_crudPanelManager(ui_diveDashboard),
// DiveDashboard member refs (primitives)
m_sequenceNumberManager(sequenceNumberManager),
m_picFilename(picFilename)
@@ -62,13 +63,29 @@
{
// This will already have been loaded by the dive manager
//this->load();
+
+ //crudPanelManager().setCrudPanelState(CrudPanelState_NoButtons);
+ //qDebug() << "grr";
}
/**
* Loads the thumbnails and other pictures
*/
+void PicManager::clear()
+{
+ m_gallery->clear();
+}
+
+/**
+* Loads the thumbnails and other pictures
+*/
void PicManager::load(const AbstractSequentialList& imageList)
{
m_gallery->init(imageList);
m_gallery->reset();
-}
\ No newline at end of file
+}
+
+CrudPanelManager& PicManager::crudPanelManager()
+{
+ return this->m_crudPanelManager;
+}
Modified: trunk/src/picmanager.h
===================================================================
--- trunk/src/picmanager.h 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/src/picmanager.h 2007-07-12 10:28:42 UTC (rev 34)
@@ -36,7 +36,7 @@
#include "config.h"
//#include "tablehelper.h"
#include "abstracttabmanager.h"
-//#include "crudpanelmanager.h"
+#include "crudpanelmanager.h"
#include "sequencenumbermanager.h"
#include "gallery.h"
#include "abstractsequentiallist.h"
@@ -65,14 +65,19 @@
QWidget* parent = 0);
Ui::DiveDashboard* m_ui_diveDashboard;
+ CrudPanelManager m_crudPanelManager;
+
const QString m_picFilename;
Data::SequenceNumberManager& m_sequenceNumberManager;
~PicManager();
+ virtual void clear();
/** Override */ virtual void tabOpened();
/** Override */ virtual void load(const Data::AbstractSequentialList& imageList);
+ virtual CrudPanelManager& crudPanelManager();
+
};
}
#endif
Modified: trunk/src/qrc_resource.cpp
===================================================================
--- trunk/src/qrc_resource.cpp 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/src/qrc_resource.cpp 2007-07-12 10:28:42 UTC (rev 34)
@@ -1,7 +1,7 @@
/****************************************************************************
** Resource object code
**
-** Created: Sun Jul 1 18:56:09 2007
+** Created: Thu Jul 12 21:51:38 2007
** by: The Resource Compiler for Qt version 4.3.0
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/ui_divedashboardwidget.h
===================================================================
--- trunk/src/ui_divedashboardwidget.h 2007-07-12 08:01:54 UTC (rev 33)
+++ trunk/src/ui_divedashboardwidget.h 2007-07-12 10:28:42 UTC (rev 34)
@@ -1,7 +1,7 @@
/********************************************************************************
** Form generated from reading ui file 'divedashboardwidget.ui'
**
-** Created: Sun Jul 1 18:34:06 2007
+** Created: Thu Jul 12 21:46:48 2007
** by: Qt User Interface Compiler version 4.3.0
**
** WARNING! All changes made in this file will be lost when recompiling ui file!
@@ -119,6 +119,8 @@
QPushButton *prevButton;
QPushButton *nextPageButton;
QPushButton *prevPageButton;
+ QPushButton *addPicButton;
+ QPushButton *deletePicButton;
QWidget *locationDetailsTabPage;
QPushButton *deleteDiveSiteButton;
QPushButton *addDiveSiteButton;
@@ -582,19 +584,19 @@
groupBox->setAlignment(Qt::AlignHCenter);
thumb4 = new QLabel(groupBox);
thumb4->setObjectName(QString::fromUtf8("thumb4"));
- thumb4->setGeometry(QRect(200, 30, 50, 50));
+ thumb4->setGeometry(QRect(207, 30, 50, 50));
thumb4->setFrameShape(QFrame::Box);
thumb1 = new QLabel(groupBox);
thumb1->setObjectName(QString::fromUtf8("thumb1"));
- thumb1->setGeometry(QRect(20, 30, 50, 50));
+ thumb1->setGeometry(QRect(27, 30, 50, 50));
thumb1->setFrameShape(QFrame::Box);
thumb2 = new QLabel(groupBox);
thumb2->setObjectName(QString::fromUtf8("thumb2"));
- thumb2->setGeometry(QRect(80, 30, 50, 50));
+ thumb2->setGeometry(QRect(87, 30, 50, 50));
thumb2->setFrameShape(QFrame::Box);
thumb3 = new QLabel(groupBox);
thumb3->setObjectName(QString::fromUtf8("thumb3"));
- thumb3->setGeometry(QRect(140, 30, 50, 50));
+ thumb3->setGeometry(QRect(147, 30, 50, 50));
thumb3->setFrameShape(QFrame::Box);
nextButton = new QPushButton(groupBox);
nextButton->setObjectName(QString::fromUtf8("nextButton"));
@@ -608,6 +610,12 @@
prevPageButton = new QPushButton(groupBox);
prevPageButton->setObjectName(QString::fromUtf8("prevPageButton"));
prevPageButton->setGeometry(QRect(10, 90, 21, 19));
+ addPicButton = new QPushButton(groupBox);
+ addPicButton->setObjectName(QString::fromUtf8("addPicButton"));
+ addPicButton->setGeometry(QRect(95, 89, 41, 25));
+ deletePicButton = new QPushButton(groupBox);
+ deletePicButton->setObjectName(QString::fromUtf8("deletePicButton"));
+ deletePicButton->setGeometry(QRect(147, 89, 41, 25));
activityTabHolder->addTab(picsTabPage, QString());
locationDetailsTabPage = new QWidget();
locationDetailsTabPage->setObjectName(QString::fromUtf8("locationDetailsTabPage"));
@@ -907,7 +915,7 @@
retranslateUi(DiveDashboard);
contextTabHolder->setCurrentIndex(0);
- activityTabHolder->setCurrentIndex(3);
+ activityTabHolder->setCurrentIndex(0);
QMetaObject::connectSlotsByName(DiveDashboard);
@@ -1047,6 +1055,8 @@
prevButton->setText(QApplication::translate("DiveDashboard", "<", 0, QApplication::UnicodeUTF8));
nextPageButton->setText(QApplication::translate("DiveDashboard", "-->", 0, QApplication::UnicodeUTF8));
prevPageButton->setText(QApplication::translate("DiveDashboard", "<--", 0, QApplication::UnicodeUTF8));
+ addPicButton->setText(QApplication::translate("DiveDashboard", "Add", 0, QApplication::UnicodeUTF8));
+ deletePicButton->setText(QApplication::translate("DiveDashboard", "Delete", 0, QApplication::UnicodeUTF8));
activityTabHolder->setTabText(activityTabHolder->indexOf(picsTabPage), QApplication::translate("DiveDashboard", "Pics", 0, QApplication::UnicodeUTF8));
deleteDiveSiteButton->setText(QApplication::translate("DiveDashboard", "Delete", 0, QApplication::UnicodeUTF8));
addDiveSiteButton->setText(QApplication::translate("DiveDashboard", "Add", 0, QApplication::UnicodeUTF8));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dec...@us...> - 2007-07-12 08:01:53
|
Revision: 33
http://frogface.svn.sourceforge.net/frogface/?rev=33&view=rev
Author: declanmcgrath
Date: 2007-07-12 01:01:54 -0700 (Thu, 12 Jul 2007)
Log Message:
-----------
Oops! Last commit was a broken build! Here is the correct one.
Modified Paths:
--------------
trunk/bin/frogface
trunk/src/gallery.cpp
trunk/src/moc_divedashboard.cpp
trunk/src/moc_divelistmanager.cpp
trunk/src/moc_gallery.cpp
trunk/src/moc_picmanager.cpp
Modified: trunk/bin/frogface
===================================================================
(Binary files differ)
Modified: trunk/src/gallery.cpp
===================================================================
--- trunk/src/gallery.cpp 2007-07-12 07:53:38 UTC (rev 32)
+++ trunk/src/gallery.cpp 2007-07-12 08:01:54 UTC (rev 33)
@@ -100,7 +100,7 @@
for (int i=0; i<imageList.count(); i++)
{
- picPack->imagenameList.append(QString("data/gallery/") + dynamic_cast<const AbstractImage&>(imageList.at(i)).filename());
+ m_imagenameList.append(QString("data/gallery/") + dynamic_cast<const AbstractImage&>(imageList.at(i)).filename());
//qDebug() << (dynamic_cast<const AbstractImage&>(imageList.at(i))).sequenceId();
}
}
Modified: trunk/src/moc_divedashboard.cpp
===================================================================
--- trunk/src/moc_divedashboard.cpp 2007-07-12 07:53:38 UTC (rev 32)
+++ trunk/src/moc_divedashboard.cpp 2007-07-12 08:01:54 UTC (rev 33)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divedashboard.h'
**
-** Created: Tue Jul 10 20:39:06 2007
+** Created: Thu Jul 12 19:58:54 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_divelistmanager.cpp
===================================================================
--- trunk/src/moc_divelistmanager.cpp 2007-07-12 07:53:38 UTC (rev 32)
+++ trunk/src/moc_divelistmanager.cpp 2007-07-12 08:01:54 UTC (rev 33)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divelistmanager.h'
**
-** Created: Tue Jul 10 20:39:43 2007
+** Created: Thu Jul 12 19:59:03 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_gallery.cpp
===================================================================
--- trunk/src/moc_gallery.cpp 2007-07-12 07:53:38 UTC (rev 32)
+++ trunk/src/moc_gallery.cpp 2007-07-12 08:01:54 UTC (rev 33)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'gallery.h'
**
-** Created: Tue Jul 10 19:42:45 2007
+** Created: Thu Jul 12 19:59:14 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_picmanager.cpp
===================================================================
--- trunk/src/moc_picmanager.cpp 2007-07-12 07:53:38 UTC (rev 32)
+++ trunk/src/moc_picmanager.cpp 2007-07-12 08:01:54 UTC (rev 33)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'picmanager.h'
**
-** Created: Tue Jul 10 20:39:58 2007
+** Created: Thu Jul 12 19:59:09 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dec...@us...> - 2007-07-12 07:53:39
|
Revision: 32
http://frogface.svn.sourceforge.net/frogface/?rev=32&view=rev
Author: declanmcgrath
Date: 2007-07-12 00:53:38 -0700 (Thu, 12 Jul 2007)
Log Message:
-----------
Simplified the library and removed a lot of crap.
Modified Paths:
--------------
trunk/frogface.kdevses
trunk/src/gallery.cpp
trunk/src/gallery.h
trunk/src/picmanager.cpp
Modified: trunk/frogface.kdevses
===================================================================
--- trunk/frogface.kdevses 2007-07-10 09:06:43 UTC (rev 31)
+++ trunk/frogface.kdevses 2007-07-12 07:53:38 UTC (rev 32)
@@ -1,27 +1,27 @@
<?xml version = '1.0' encoding = 'UTF-8'?>
<!DOCTYPE KDevPrjSession>
<KDevPrjSession>
- <DocsAndViews NumberOfDocuments="34" >
+ <DocsAndViews NumberOfDocuments="37" >
<Doc0 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/location.h" >
<View0 Type="Source" />
</Doc0>
<Doc1 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/gallery.h" >
- <View0 Type="Source" />
+ <View0 line="30" Type="Source" />
</Doc1>
<Doc2 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/gallery.cpp" >
- <View0 Type="Source" />
+ <View0 line="65" Type="Source" />
</Doc2>
<Doc3 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/picmanager.h" >
- <View0 Type="Source" />
+ <View0 line="70" Type="Source" />
</Doc3>
<Doc4 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/picmanager.cpp" >
- <View0 Type="Source" />
+ <View0 line="47" Type="Source" />
</Doc4>
<Doc5 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divelistmanager.h" >
- <View0 Type="Source" />
+ <View0 line="0" Type="Source" />
</Doc5>
<Doc6 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divelistmanager.cpp" >
- <View0 Type="Source" />
+ <View0 line="297" Type="Source" />
</Doc6>
<Doc7 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divedashboard.h" >
<View0 Type="Source" />
@@ -48,7 +48,7 @@
<View0 Type="Source" />
</Doc14>
<Doc15 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/dive.cpp" >
- <View0 Type="Source" />
+ <View0 line="424" Type="Source" />
</Doc15>
<Doc16 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/src/xml/qdom.cpp" >
<View0 Type="Source" />
@@ -60,7 +60,7 @@
<View0 Type="Source" />
</Doc18>
<Doc19 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/diveimagelist.cpp" >
- <View0 Type="Source" />
+ <View0 line="103" Type="Source" />
</Doc19>
<Doc20 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/diveimagelist.h" >
<View0 Type="Source" />
@@ -104,25 +104,25 @@
<Doc33 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/abstractsequentialitem.cpp" >
<View0 line="18" Type="Source" />
</Doc33>
+ <Doc34 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/src/corelib/tools/qlist.h" >
+ <View0 line="379" Type="Source" />
+ </Doc34>
+ <Doc35 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/moc_gallery.cpp" >
+ <View0 line="54" Type="Source" />
+ </Doc35>
+ <Doc36 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/projecthelper.h" >
+ <View0 line="46" Type="Source" />
+ </Doc36>
</DocsAndViews>
<pluginList>
<kdevdebugger>
<breakpointList>
- <breakpoint0 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/dive.cpp:425" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <breakpoint0 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/gallery.cpp:60" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
<tracedExpressions/>
</breakpoint0>
- <breakpoint1 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/dive.cpp:338" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <breakpoint1 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/gallery.cpp:125" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
<tracedExpressions/>
</breakpoint1>
- <breakpoint2 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/diveimagelist.cpp:104" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
- <tracedExpressions/>
- </breakpoint2>
- <breakpoint3 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divelistmanager.cpp:298" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
- <tracedExpressions/>
- </breakpoint3>
- <breakpoint4 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divelistmanager.cpp:145" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
- <tracedExpressions/>
- </breakpoint4>
</breakpointList>
</kdevdebugger>
<kdevbookmarks>
Modified: trunk/src/gallery.cpp
===================================================================
--- trunk/src/gallery.cpp 2007-07-10 09:06:43 UTC (rev 31)
+++ trunk/src/gallery.cpp 2007-07-12 07:53:38 UTC (rev 32)
@@ -25,18 +25,6 @@
using namespace Extra;
using namespace Data;
-PicPack::PicPack()
-: packSequenceId(0)
-{};
-
-PicPack::~PicPack()
-{};
-
-SnapshotInfo::SnapshotInfo()
-: packSequenceId(0)
-{};
-SnapshotInfo::~SnapshotInfo() {};
-
Gallery::Gallery( QLabel &snapshotImage,
QPushButton& nextButton, QPushButton& prevButton,
QPushButton& nextPageButton, QPushButton& prevPageButton,
@@ -48,23 +36,19 @@
m_nextPageButton(nextPageButton),
m_prevPageButton(prevPageButton)
{
- //init();
};
Gallery::~Gallery(){};
-// void Gallery::init() // Stuff that happens on loading of page
-// { buildGallery(); } // Build up our gallery
-
void Gallery::nextSnapshot()
{
- m_activeSnapshotInfo.imageIndex++;
+ m_activeImageIndex++;
updateDisplay();
}
void Gallery::previousSnapshot()
{
- m_activeSnapshotInfo.imageIndex--;
+ m_activeImageIndex--;
updateDisplay();
}
@@ -74,37 +58,26 @@
//Returns: Nothing
void Gallery::updateDisplay()
{
- // We take the details stored in activeSnapshotInfo.
- // Based on these details we get ready to display an image
- // in the main area of the screen
- PicPack& activePicPack = m_packList[m_activeSnapshotInfo.packSequenceId - 1];
- int activeImageIndex = m_activeSnapshotInfo.imageIndex;
-
- //alert("activeImageIndex: " + activeImageIndex);
- //alert(gallery.itemList[1].imageList[2]);
-
QPixmap *pixmap = new QPixmap(); // Load picture
- pixmap->load(activePicPack.imagenameList[activeImageIndex]);
+ pixmap->load(m_imagenameList[m_activeImageIndex]);
m_snapshotImage.setPixmap(*pixmap);
-
- int numProjectImages = activePicPack.imagenameList.count(); // enable/disable buttons:
- updateDisplayOfPrevNextButtons(activeImageIndex, numProjectImages);
+ updateDisplayOfPrevNextButtons(); // enable/disable buttons:
}
-void Gallery::updateDisplayOfPrevNextButtons(int activeImageIndex, int numProjectImages)
+void Gallery::updateDisplayOfPrevNextButtons()
{
// ASSERTION: We have at least 1 image in our list
- if (numProjectImages < 1)
+ if (m_imagenameList.count() < 1)
{
- throw "numProjectImages must be greater than 1. Current value: " + numProjectImages;
+ throw "numProjectImages must be greater than 1. Current value: " + m_imagenameList.count();
}
- if (activeImageIndex > 0) // PREVIOUS BUTTON ENABLEMENT
+ if (m_activeImageIndex > 0) // PREVIOUS BUTTON ENABLEMENT
{ m_prevButton.setVisible(true); }
else
{ m_prevButton.setVisible(false); }
- if ( activeImageIndex < (numProjectImages - 1) ) // NEXT BUTTON ENABLEMENT
+ if ( m_activeImageIndex < (m_imagenameList.count() - 1) ) // NEXT BUTTON ENABLEMENT
{ m_nextButton.setVisible(true); }
else
{ m_nextButton.setVisible(false); }
@@ -114,43 +87,21 @@
//Params:
// projectId - This is the ID of the project we wish to change to
//Returns: Nothing
-void Gallery::changeActiveSnapshotInfo(int aPackSequenceId)
+void Gallery::reset()
{
- m_activeSnapshotInfo.packSequenceId = aPackSequenceId; // Set new pack seq ID
- m_activeSnapshotInfo.imageIndex = 0; // Set series ID to the first in the list
+ m_activeImageIndex = 0; // Set series ID to the first in the list
updateDisplay();
}
-void Gallery::buildGallery(const AbstractSequentialList& imageList)
+void Gallery::init(const AbstractSequentialList& imageList)
{
- m_packList.clear();
- m_activeSnapshotInfo.imageIndex = 0;
+ m_imagenameList.clear();
+ m_activeImageIndex = 0;
- PicPack* picPack = new PicPack();
- picPack->packSequenceId = 1; // This is no longer important //TODO: remove
-
for (int i=0; i<imageList.count(); i++)
{
picPack->imagenameList.append(QString("data/gallery/") + dynamic_cast<const AbstractImage&>(imageList.at(i)).filename());
- //qDebug() << picPack->imagenameList[i];
- qDebug() << (dynamic_cast<const AbstractImage&>(imageList.at(i))).sequenceId();
+ //qDebug() << (dynamic_cast<const AbstractImage&>(imageList.at(i))).sequenceId();
}
-
- m_packList << *picPack;
-
-// //#1
-// PicPack* picPack1 = new PicPack();
-// picPack1->packSequenceId = 1;
-// picPack1->imageList << "data/gallery/1/1.jpg" << "data/gallery/1/2.jpg" << "data/gallery/1/3.jpg" << "data/gallery/1/4.jpg";
-//
-// PicPack* picPack2 = new PicPack();
-// picPack2->packSequenceId = 2;
-// picPack2->imageList << "data/gallery/2/1.jpg" << "data/gallery/2/2.jpg";
-
-// PicPack* picPack3 = new PicPack();
-// picPack3->packSequenceId = 3;
-// picPack3->imageList << "data/gallery/3/1.jpg" << "data/gallery/3/2.jpg" << "data/gallery/3/3.jpg";
-//
-// m_packList << *picPack1 << *picPack2 << *picPack3;
}
Modified: trunk/src/gallery.h
===================================================================
--- trunk/src/gallery.h 2007-07-10 09:06:43 UTC (rev 31)
+++ trunk/src/gallery.h 2007-07-12 07:53:38 UTC (rev 32)
@@ -34,28 +34,6 @@
namespace Extra
{
- class PicPack
- {
- public:
- PicPack();
- ~PicPack();
-
- // THESE SHOULD BE PRIVATE
- int packSequenceId; // eg. dive sequence id, important and also a unique identifier, same a folder name
- QList<QString> imagenameList;
- };
-
- // KING!!!
- class SnapshotInfo
- {
- public:
- SnapshotInfo();
- ~SnapshotInfo();
-
- int packSequenceId; // remember to subtract -1 off this when looking up an array
- int imageIndex; // no need to subtract -1 when looking up arrays
- };
-
class Gallery : public QObject
{
Q_OBJECT
@@ -66,9 +44,10 @@
QPushButton& m_prevButton;
QPushButton& m_nextPageButton;
QPushButton& m_prevPageButton;
- QList<PicPack> m_packList;
- SnapshotInfo m_activeSnapshotInfo; // This will identify which image to display in the main area of the screen
+ int m_activeImageIndex; // no need to subtract -1 when looking up arrays - This will identify which image to display in the main area of the
+ QList<QString> m_imagenameList; // holds all images for dive
+
public:
Gallery( QLabel &snapshotImage,
QPushButton& nextButton, QPushButton& prevButton,
@@ -76,26 +55,16 @@
QObject* parent = 0);
~Gallery();
- //void init();
void updateDisplay();
- void updateDisplayOfPrevNextButtons(int activeImageIndex, int numProjectImages);
- void changeActiveSnapshotInfo(int aPackSequenceId);
- void buildGallery(const Data::AbstractSequentialList& imageList);
+ void updateDisplayOfPrevNextButtons();
+ void reset();
+ void init(const Data::AbstractSequentialList& imageList);
public slots:
void nextSnapshot();
void previousSnapshot();
};
-// QLabel snapshotImage;
-// QPushButton nextButton;
-// QPushButton prevButton;
-// QPushButton nextPageButton;
-// QPushButton prevPageButton;
-// Gallery gallery( snapshotImage,
-// nextButton, prevButton,
-// nextPageButton, prevPageButton); // This holds a list of gallery items (note: 1 galleryItem exists for each project)
-
}
#endif
Modified: trunk/src/picmanager.cpp
===================================================================
--- trunk/src/picmanager.cpp 2007-07-10 09:06:43 UTC (rev 31)
+++ trunk/src/picmanager.cpp 2007-07-12 07:53:38 UTC (rev 32)
@@ -69,6 +69,6 @@
*/
void PicManager::load(const AbstractSequentialList& imageList)
{
- m_gallery->buildGallery(imageList);
- m_gallery->changeActiveSnapshotInfo(1);
+ m_gallery->init(imageList);
+ m_gallery->reset();
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dec...@us...> - 2007-07-10 09:07:00
|
Revision: 31
http://frogface.svn.sourceforge.net/frogface/?rev=31&view=rev
Author: declanmcgrath
Date: 2007-07-10 02:06:43 -0700 (Tue, 10 Jul 2007)
Log Message:
-----------
Fixed reloading of image library on switching between dives.
Modified Paths:
--------------
trunk/bin/frogface
trunk/frogface.kdevses
trunk/src/Makefile
trunk/src/gallery.cpp
trunk/src/moc_divedashboard.cpp
trunk/src/moc_divelistmanager.cpp
trunk/src/moc_divetablemodel.cpp
trunk/src/moc_gallery.cpp
trunk/src/moc_picmanager.cpp
trunk/src/picmanager.cpp
Added Paths:
-----------
trunk/bin/data/gallery/
trunk/bin/data/gallery/1.jpg
trunk/bin/data/gallery/2.jpg
trunk/bin/data/gallery/3.jpg
trunk/bin/data/gallery/4.jpg
trunk/bin/data/gallery/5.jpg
trunk/bin/data/gallery/6.jpg
Added: trunk/bin/data/gallery/1.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/bin/data/gallery/1.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/bin/data/gallery/2.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/bin/data/gallery/2.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/bin/data/gallery/3.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/bin/data/gallery/3.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/bin/data/gallery/4.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/bin/data/gallery/4.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/bin/data/gallery/5.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/bin/data/gallery/5.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/bin/data/gallery/6.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/bin/data/gallery/6.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/bin/frogface
===================================================================
(Binary files differ)
Modified: trunk/frogface.kdevses
===================================================================
--- trunk/frogface.kdevses 2007-07-07 12:22:21 UTC (rev 30)
+++ trunk/frogface.kdevses 2007-07-10 09:06:43 UTC (rev 31)
@@ -1,137 +1,128 @@
<?xml version = '1.0' encoding = 'UTF-8'?>
<!DOCTYPE KDevPrjSession>
<KDevPrjSession>
- <DocsAndViews NumberOfDocuments="21" >
- <Doc0 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/gallery.h" >
- <View0 line="73" Type="Source" />
+ <DocsAndViews NumberOfDocuments="34" >
+ <Doc0 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/location.h" >
+ <View0 Type="Source" />
</Doc0>
- <Doc1 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/gallery.cpp" >
- <View0 line="125" Type="Source" />
+ <Doc1 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/gallery.h" >
+ <View0 Type="Source" />
</Doc1>
- <Doc2 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/picmanager.h" >
- <View0 line="67" Type="Source" />
+ <Doc2 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/gallery.cpp" >
+ <View0 Type="Source" />
</Doc2>
- <Doc3 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/picmanager.cpp" >
- <View0 line="53" Type="Source" />
+ <Doc3 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/picmanager.h" >
+ <View0 Type="Source" />
</Doc3>
- <Doc4 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/dive.h" >
- <View0 line="224" Type="Source" />
+ <Doc4 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/picmanager.cpp" >
+ <View0 Type="Source" />
</Doc4>
- <Doc5 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divesitelist.h" >
- <View0 line="49" Type="Source" />
+ <Doc5 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divelistmanager.h" >
+ <View0 Type="Source" />
</Doc5>
- <Doc6 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/location.h" >
- <View0 line="94" Type="Source" />
+ <Doc6 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divelistmanager.cpp" >
+ <View0 Type="Source" />
</Doc6>
- <Doc7 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/dive.cpp" >
- <View0 line="247" Type="Source" />
+ <Doc7 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divedashboard.h" >
+ <View0 Type="Source" />
</Doc7>
- <Doc8 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/location.cpp" >
- <View0 line="92" Type="Source" />
+ <Doc8 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divedashboard.cpp" >
+ <View0 Type="Source" />
</Doc8>
- <Doc9 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/diveimagelist.h" >
- <View0 line="44" Type="Source" />
+ <Doc9 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/abstractrecordlistmanager.cpp" >
+ <View0 Type="Source" />
</Doc9>
- <Doc10 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/abstractsequentiallist.h" >
- <View0 line="41" Type="Source" />
+ <Doc10 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/src/corelib/global/qnamespace.h" >
+ <View0 Type="Source" />
</Doc10>
- <Doc11 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/locationlist.h" >
- <View0 line="39" Type="Source" />
+ <Doc11 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/abstractserialisable.cpp" >
+ <View0 Type="Source" />
</Doc11>
- <Doc12 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/locationlist.cpp" >
- <View0 line="0" Type="Source" />
+ <Doc12 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/sequencenumbermanager.cpp" >
+ <View0 Type="Source" />
</Doc12>
- <Doc13 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/diveimagelist.cpp" >
- <View0 line="97" Type="Source" />
+ <Doc13 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/buddytablemodel.cpp" >
+ <View0 Type="Source" />
</Doc13>
- <Doc14 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divesitelist.cpp" >
- <View0 line="0" Type="Source" />
+ <Doc14 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divelist.cpp" >
+ <View0 Type="Source" />
</Doc14>
- <Doc15 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/diveimage.h" >
- <View0 line="44" Type="Source" />
+ <Doc15 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/dive.cpp" >
+ <View0 Type="Source" />
</Doc15>
- <Doc16 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divesite.h" >
- <View0 line="40" Type="Source" />
+ <Doc16 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/src/xml/qdom.cpp" >
+ <View0 Type="Source" />
</Doc16>
- <Doc17 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/diveimage.cpp" >
- <View0 line="44" Type="Source" />
+ <Doc17 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/dive.h" >
+ <View0 Type="Source" />
</Doc17>
- <Doc18 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divesite.cpp" >
- <View0 line="153" Type="Source" />
+ <Doc18 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/convenience.h" >
+ <View0 Type="Source" />
</Doc18>
- <Doc19 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/sequencenumbermanager.h" >
- <View0 line="40" Type="Source" />
+ <Doc19 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/diveimagelist.cpp" >
+ <View0 Type="Source" />
</Doc19>
- <Doc20 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divelist.cpp" >
- <View0 line="118" Type="Source" />
+ <Doc20 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/diveimagelist.h" >
+ <View0 Type="Source" />
</Doc20>
+ <Doc21 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divesite.h" >
+ <View0 Type="Source" />
+ </Doc21>
+ <Doc22 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divesitelist.h" >
+ <View0 Type="Source" />
+ </Doc22>
+ <Doc23 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divesitelist.cpp" >
+ <View0 Type="Source" />
+ </Doc23>
+ <Doc24 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/diveimage.h" >
+ <View0 Type="Source" />
+ </Doc24>
+ <Doc25 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/abstractimage.h" >
+ <View0 Type="Source" />
+ </Doc25>
+ <Doc26 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/abstractsequentiallist.h" >
+ <View0 Type="Source" />
+ </Doc26>
+ <Doc27 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/buddylist.h" >
+ <View0 Type="Source" />
+ </Doc27>
+ <Doc28 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/tests/testdive/src/testdive.cpp" >
+ <View0 Type="Source" />
+ </Doc28>
+ <Doc29 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/abstractimage.cpp" >
+ <View0 Type="Source" />
+ </Doc29>
+ <Doc30 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/abstractserialisable.h" >
+ <View0 Type="Source" />
+ </Doc30>
+ <Doc31 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/abstractsequentialitem.h" >
+ <View0 Type="Source" />
+ </Doc31>
+ <Doc32 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/abstractrecord.h" >
+ <View0 Type="Source" />
+ </Doc32>
+ <Doc33 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/abstractsequentialitem.cpp" >
+ <View0 line="18" Type="Source" />
+ </Doc33>
</DocsAndViews>
<pluginList>
<kdevdebugger>
<breakpointList>
- <breakpoint0 location="/mnt/extra/Projects/frogface-sc/branches/release-2.0.2/src/locationlistmanager.cpp:138" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <breakpoint0 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/dive.cpp:425" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
<tracedExpressions/>
</breakpoint0>
- <breakpoint1 location="/mnt/extra/Projects/frogface-sc/branches/release-2.0.2/src/locationlistmanager.cpp:136" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <breakpoint1 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/dive.cpp:338" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
<tracedExpressions/>
</breakpoint1>
- <breakpoint2 location="/mnt/extra/Projects/frogface-sc/branches/release-2.0.2/src/userprofilemanager.cpp:262" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <breakpoint2 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/diveimagelist.cpp:104" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
<tracedExpressions/>
</breakpoint2>
- <breakpoint3 location="/mnt/extra/Projects/frogface-sc/branches/release-2.0.2/src/divedashboard.cpp:44" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <breakpoint3 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divelistmanager.cpp:298" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
<tracedExpressions/>
</breakpoint3>
- <breakpoint4 location="/mnt/extra/Projects/frogface-sc/branches/release-2.0.2/src/divedashboard.cpp:46" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <breakpoint4 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divelistmanager.cpp:145" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
<tracedExpressions/>
</breakpoint4>
- <breakpoint5 location="/mnt/extra/Projects/frogface-sc/branches/release-2.0.2/src/divedashboard.cpp:175" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
- <tracedExpressions/>
- </breakpoint5>
- <breakpoint6 location="/mnt/extra/Projects/frogface-sc/branches/release-2.0.2/src/divedashboard.cpp:163" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
- <tracedExpressions/>
- </breakpoint6>
- <breakpoint7 location="/mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/sequencenumbermanager.cpp:79" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
- <tracedExpressions/>
- </breakpoint7>
- <breakpoint8 location="/mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/buddylistmanager.cpp:217" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
- <tracedExpressions/>
- </breakpoint8>
- <breakpoint9 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/crudpanelmanager.cpp:38" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
- <tracedExpressions/>
- </breakpoint9>
- <breakpoint10 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/userprofilemanager.cpp:179" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
- <tracedExpressions/>
- </breakpoint10>
- <breakpoint11 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/userprofilemanager.cpp:98" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
- <tracedExpressions/>
- </breakpoint11>
- <breakpoint12 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/userprofilemanager.cpp:94" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
- <tracedExpressions/>
- </breakpoint12>
- <breakpoint13 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/userprofilemanager.cpp:180" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
- <tracedExpressions/>
- </breakpoint13>
- <breakpoint14 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/userprofilemanager.cpp:99" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
- <tracedExpressions/>
- </breakpoint14>
- <breakpoint15 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/userprofilemanager.cpp:76" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
- <tracedExpressions/>
- </breakpoint15>
- <breakpoint16 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divelistmanager.cpp:53" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
- <tracedExpressions/>
- </breakpoint16>
- <breakpoint17 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/fdomdocument.cpp:57" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
- <tracedExpressions/>
- </breakpoint17>
- <breakpoint18 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/fdomdocument.cpp:43" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
- <tracedExpressions/>
- </breakpoint18>
- <breakpoint19 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/fdomdocument.cpp:49" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
- <tracedExpressions/>
- </breakpoint19>
- <breakpoint20 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/picmanager.cpp:63" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
- <tracedExpressions/>
- </breakpoint20>
</breakpointList>
</kdevdebugger>
<kdevbookmarks>
Modified: trunk/src/Makefile
===================================================================
--- trunk/src/Makefile 2007-07-07 12:22:21 UTC (rev 30)
+++ trunk/src/Makefile 2007-07-10 09:06:43 UTC (rev 31)
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: ../bin/frogface
-# Generated by qmake (2.01a) (Qt 4.3.0) on: Sat Jul 7 21:41:17 2007
+# Generated by qmake (2.01a) (Qt 4.3.0) on: Tue Jul 10 19:40:53 2007
# Project: src.pro
# Template: app
# Command: /usr/local/Trolltech/Qt-4.3.0/bin/qmake -unix -o Makefile src.pro
@@ -96,8 +96,7 @@
gallery.cpp \
diveimagelist.cpp \
diveimage.cpp \
- abstractimage.cpp \
- abstractimagelist.cpp moc_divetablemodel.cpp \
+ abstractimage.cpp moc_divetablemodel.cpp \
moc_divedashboard.cpp \
moc_divesitetablemodel.cpp \
moc_locationtablemodel.cpp \
@@ -167,7 +166,6 @@
diveimagelist.o \
diveimage.o \
abstractimage.o \
- abstractimagelist.o \
moc_divetablemodel.o \
moc_divedashboard.o \
moc_divesitetablemodel.o \
@@ -284,7 +282,7 @@
dist:
@$(CHK_DIR_EXISTS) .tmp/frogface1.0.0 || $(MKDIR) .tmp/frogface1.0.0
- $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/frogface1.0.0/ && $(COPY_FILE) --parents dive.h vdecimal.h vdecimallite.h config.h diveprofile.h xmlserialiser.h projecthelper.h location.h locationlist.h divesite.h divesitelist.h divetablemodel.h userprofile.h divelist.h divedashboard.h ui_divedashboardwidget.h countrylist.h country.h countrytablemodel.h divesitetablemodel.h locationtablemodel.h sequencenumbermanager.h abstractserialisable.h abstractsequentialitem.h abstractsequentiallist.h abstractsequentialtablemodel.h tablehelper.h enums.h vtimehelper.h abstractrecord.h crudpanelmanager.h divelistmanager.h locationlistmanager.h abstractrecordlistmanager.h abstractrecordsetmanager.h userprofilemanager.h abstractrecordlist.h qstringhelper.h froggiemainwindow.h convenience.h buddy.h buddylist.h buddytablemodel.h buddylistmanager.h profilebase.h iohelper.h picmanager.h abstracttabmanager.h fdomdocument.h browser.h jsdomdocument.h gallery.h diveimagelist.h diveimage.h abstractimage.h abstractimagelist.h .tmp/frogface1.0.0/ && $(COPY_FILE) --parents resource.qrc .tmp/frogface1.0.0/ && $(COPY_FILE) --parents divedashboard.cpp dive.cpp vdecimal.cpp vdecimallite.cpp diveprofile.cpp xmlserialiser.cpp projecthelper.cpp location.cpp locationlist.cpp divesite.cpp divesitelist.cpp divetablemodel.cpp userprofile.cpp divelist.cpp main.cpp testermain.cpp countrylist.cpp country.cpp countrytablemodel.cpp divesitetablemodel.cpp locationtablemodel.cpp sequencenumbermanager.cpp froggiemainwindow.cpp config.cpp abstractserialisable.cpp abstractsequentialitem.cpp abstractsequentiallist.cpp abstractsequentialtablemodel.cpp tablehelper.cpp vtimehelper.cpp abstractrecord.cpp crudpanelmanager.cpp divelistmanager.cpp locationlistmanager.cpp abstractrecordlistmanager.cpp abstractrecordsetmanager.cpp userprofilemanager.cpp abstractrecordlist.cpp qstringhelper.cpp convenience.cpp buddy.cpp buddylist.cpp buddytablemodel.cpp buddylistmanager.cpp profilebase.cpp iohelper.cpp picmanager.cpp abstracttabmanager.cpp fdomdocument.cpp browser.cpp jsdomdocument.cpp gallery.cpp diveimagelist.cpp diveimage.cpp abstractimage.cpp abstractimagelist.cpp .tmp/frogface1.0.0/ && $(COPY_FILE) --parents divedashboardwidget.ui .tmp/frogface1.0.0/ && (cd `dirname .tmp/frogface1.0.0` && $(TAR) frogface1.0.0.tar frogface1.0.0 && $(COMPRESS) frogface1.0.0.tar) && $(MOVE) `dirname .tmp/frogface1.0.0`/frogface1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/frogface1.0.0
+ $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/frogface1.0.0/ && $(COPY_FILE) --parents dive.h vdecimal.h vdecimallite.h config.h diveprofile.h xmlserialiser.h projecthelper.h location.h locationlist.h divesite.h divesitelist.h divetablemodel.h userprofile.h divelist.h divedashboard.h ui_divedashboardwidget.h countrylist.h country.h countrytablemodel.h divesitetablemodel.h locationtablemodel.h sequencenumbermanager.h abstractserialisable.h abstractsequentialitem.h abstractsequentiallist.h abstractsequentialtablemodel.h tablehelper.h enums.h vtimehelper.h abstractrecord.h crudpanelmanager.h divelistmanager.h locationlistmanager.h abstractrecordlistmanager.h abstractrecordsetmanager.h userprofilemanager.h abstractrecordlist.h qstringhelper.h froggiemainwindow.h convenience.h buddy.h buddylist.h buddytablemodel.h buddylistmanager.h profilebase.h iohelper.h picmanager.h abstracttabmanager.h fdomdocument.h browser.h jsdomdocument.h gallery.h diveimagelist.h diveimage.h abstractimage.h .tmp/frogface1.0.0/ && $(COPY_FILE) --parents resource.qrc .tmp/frogface1.0.0/ && $(COPY_FILE) --parents divedashboard.cpp dive.cpp vdecimal.cpp vdecimallite.cpp diveprofile.cpp xmlserialiser.cpp projecthelper.cpp location.cpp locationlist.cpp divesite.cpp divesitelist.cpp divetablemodel.cpp userprofile.cpp divelist.cpp main.cpp testermain.cpp countrylist.cpp country.cpp countrytablemodel.cpp divesitetablemodel.cpp locationtablemodel.cpp sequencenumbermanager.cpp froggiemainwindow.cpp config.cpp abstractserialisable.cpp abstractsequentialitem.cpp abstractsequentiallist.cpp abstractsequentialtablemodel.cpp tablehelper.cpp vtimehelper.cpp abstractrecord.cpp crudpanelmanager.cpp divelistmanager.cpp locationlistmanager.cpp abstractrecordlistmanager.cpp abstractrecordsetmanager.cpp userprofilemanager.cpp abstractrecordlist.cpp qstringhelper.cpp convenience.cpp buddy.cpp buddylist.cpp buddytablemodel.cpp buddylistmanager.cpp profilebase.cpp iohelper.cpp picmanager.cpp abstracttabmanager.cpp fdomdocument.cpp browser.cpp jsdomdocument.cpp gallery.cpp diveimagelist.cpp diveimage.cpp abstractimage.cpp .tmp/frogface1.0.0/ && $(COPY_FILE) --parents divedashboardwidget.ui .tmp/frogface1.0.0/ && (cd `dirname .tmp/frogface1.0.0` && $(TAR) frogface1.0.0.tar frogface1.0.0 && $(COMPRESS) frogface1.0.0.tar) && $(MOVE) `dirname .tmp/frogface1.0.0`/frogface1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/frogface1.0.0
clean:compiler_clean
@@ -325,6 +323,7 @@
vdecimallite.h \
diveimagelist.h \
diveimage.h \
+ abstractimage.h \
abstractsequentialtablemodel.h \
config.h \
divetablemodel.h
@@ -354,6 +353,7 @@
abstractsequentiallist.h \
abstractrecordlist.h \
diveimage.h \
+ abstractimage.h \
divelist.h \
divetablemodel.h \
locationlist.h \
@@ -426,6 +426,7 @@
abstractsequentiallist.h \
abstractrecordlist.h \
diveimage.h \
+ abstractimage.h \
enums.h \
divelist.h \
divetablemodel.h \
@@ -552,6 +553,11 @@
abstractserialisable.h \
xmlserialiser.h \
gallery.h \
+ abstractsequentiallist.h \
+ abstractrecordlist.h \
+ abstractsequentialitem.h \
+ abstractrecord.h \
+ abstractimage.h \
picmanager.h
/usr/local/Trolltech/Qt-4.3.0/bin/moc $(DEFINES) $(INCPATH) picmanager.h -o moc_picmanager.cpp
@@ -560,7 +566,13 @@
browser.h
/usr/local/Trolltech/Qt-4.3.0/bin/moc $(DEFINES) $(INCPATH) browser.h -o moc_browser.cpp
-moc_gallery.cpp: gallery.h
+moc_gallery.cpp: abstractsequentiallist.h \
+ abstractrecordlist.h \
+ abstractserialisable.h \
+ abstractsequentialitem.h \
+ abstractrecord.h \
+ abstractimage.h \
+ gallery.h
/usr/local/Trolltech/Qt-4.3.0/bin/moc $(DEFINES) $(INCPATH) gallery.h -o moc_gallery.cpp
compiler_rcc_make_all: qrc_resource.cpp
@@ -616,6 +628,7 @@
abstractsequentiallist.h \
abstractrecordlist.h \
diveimage.h \
+ abstractimage.h \
divelist.h \
divetablemodel.h \
locationlist.h \
@@ -652,7 +665,8 @@
diveimagelist.h \
abstractsequentiallist.h \
abstractrecordlist.h \
- diveimage.h
+ diveimage.h \
+ abstractimage.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o dive.o dive.cpp
vdecimal.o: vdecimal.cpp vdecimal.h \
@@ -745,6 +759,7 @@
vdecimallite.h \
diveimagelist.h \
diveimage.h \
+ abstractimage.h \
abstractsequentialtablemodel.h \
config.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o divetablemodel.o divetablemodel.cpp
@@ -770,7 +785,8 @@
diveimagelist.h \
abstractsequentiallist.h \
abstractrecordlist.h \
- diveimage.h
+ diveimage.h \
+ abstractimage.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o divelist.o divelist.cpp
main.o: main.cpp config.h \
@@ -798,6 +814,7 @@
abstractsequentiallist.h \
abstractrecordlist.h \
diveimage.h \
+ abstractimage.h \
divelist.h \
divetablemodel.h \
locationlist.h \
@@ -953,6 +970,7 @@
abstractsequentiallist.h \
abstractrecordlist.h \
diveimage.h \
+ abstractimage.h \
enums.h \
divelist.h \
divetablemodel.h \
@@ -1138,7 +1156,12 @@
sequencenumbermanager.h \
abstractserialisable.h \
xmlserialiser.h \
- gallery.h
+ gallery.h \
+ abstractsequentiallist.h \
+ abstractrecordlist.h \
+ abstractsequentialitem.h \
+ abstractrecord.h \
+ abstractimage.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o picmanager.o picmanager.cpp
abstracttabmanager.o: abstracttabmanager.cpp abstracttabmanager.h
@@ -1156,7 +1179,13 @@
fdomdocument.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o jsdomdocument.o jsdomdocument.cpp
-gallery.o: gallery.cpp gallery.h
+gallery.o: gallery.cpp gallery.h \
+ abstractsequentiallist.h \
+ abstractrecordlist.h \
+ abstractserialisable.h \
+ abstractsequentialitem.h \
+ abstractrecord.h \
+ abstractimage.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o gallery.o gallery.cpp
diveimagelist.o: diveimagelist.cpp diveimagelist.h \
@@ -1168,7 +1197,8 @@
diveimage.h \
xmlserialiser.h \
sequencenumbermanager.h \
- projecthelper.h
+ projecthelper.h \
+ abstractimage.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o diveimagelist.o diveimagelist.cpp
diveimage.o: diveimage.cpp diveimage.h \
@@ -1176,16 +1206,17 @@
sequencenumbermanager.h \
projecthelper.h \
abstractserialisable.h \
+ abstractimage.h \
abstractsequentialitem.h \
abstractrecord.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o diveimage.o diveimage.cpp
-abstractimage.o: abstractimage.cpp abstractimage.h
+abstractimage.o: abstractimage.cpp abstractimage.h \
+ abstractsequentialitem.h \
+ abstractrecord.h \
+ abstractserialisable.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o abstractimage.o abstractimage.cpp
-abstractimagelist.o: abstractimagelist.cpp abstractimagelist.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o abstractimagelist.o abstractimagelist.cpp
-
moc_divetablemodel.o: moc_divetablemodel.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_divetablemodel.o moc_divetablemodel.cpp
Modified: trunk/src/gallery.cpp
===================================================================
--- trunk/src/gallery.cpp 2007-07-07 12:22:21 UTC (rev 30)
+++ trunk/src/gallery.cpp 2007-07-10 09:06:43 UTC (rev 31)
@@ -124,6 +124,7 @@
void Gallery::buildGallery(const AbstractSequentialList& imageList)
{
m_packList.clear();
+ m_activeSnapshotInfo.imageIndex = 0;
PicPack* picPack = new PicPack();
picPack->packSequenceId = 1; // This is no longer important //TODO: remove
Modified: trunk/src/moc_divedashboard.cpp
===================================================================
--- trunk/src/moc_divedashboard.cpp 2007-07-07 12:22:21 UTC (rev 30)
+++ trunk/src/moc_divedashboard.cpp 2007-07-10 09:06:43 UTC (rev 31)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divedashboard.h'
**
-** Created: Sun Jul 8 00:06:23 2007
+** Created: Tue Jul 10 20:39:06 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_divelistmanager.cpp
===================================================================
--- trunk/src/moc_divelistmanager.cpp 2007-07-07 12:22:21 UTC (rev 30)
+++ trunk/src/moc_divelistmanager.cpp 2007-07-10 09:06:43 UTC (rev 31)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divelistmanager.h'
**
-** Created: Sun Jul 8 00:06:33 2007
+** Created: Tue Jul 10 20:39:43 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_divetablemodel.cpp
===================================================================
--- trunk/src/moc_divetablemodel.cpp 2007-07-07 12:22:21 UTC (rev 30)
+++ trunk/src/moc_divetablemodel.cpp 2007-07-10 09:06:43 UTC (rev 31)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divetablemodel.h'
**
-** Created: Sun Jul 8 00:06:19 2007
+** Created: Tue Jul 10 19:42:17 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_gallery.cpp
===================================================================
--- trunk/src/moc_gallery.cpp 2007-07-07 12:22:21 UTC (rev 30)
+++ trunk/src/moc_gallery.cpp 2007-07-10 09:06:43 UTC (rev 31)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'gallery.h'
**
-** Created: Sat Jul 7 23:59:40 2007
+** Created: Tue Jul 10 19:42:45 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_picmanager.cpp
===================================================================
--- trunk/src/moc_picmanager.cpp 2007-07-07 12:22:21 UTC (rev 30)
+++ trunk/src/moc_picmanager.cpp 2007-07-10 09:06:43 UTC (rev 31)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'picmanager.h'
**
-** Created: Sat Jul 7 23:59:31 2007
+** Created: Tue Jul 10 20:39:58 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/picmanager.cpp
===================================================================
--- trunk/src/picmanager.cpp 2007-07-07 12:22:21 UTC (rev 30)
+++ trunk/src/picmanager.cpp 2007-07-10 09:06:43 UTC (rev 31)
@@ -39,6 +39,14 @@
m_sequenceNumberManager(sequenceNumberManager),
m_picFilename(picFilename)
{
+ m_gallery = new Extra::Gallery( *(m_ui_diveDashboard->snapshotImage),
+ *(m_ui_diveDashboard->nextButton), *(m_ui_diveDashboard->prevButton),
+ *(m_ui_diveDashboard->nextPageButton), *(m_ui_diveDashboard->prevPageButton),
+ this);
+
+ m_ui_diveDashboard->snapshotImage->setScaledContents(true); //make pics fit viewport
+ connect(m_ui_diveDashboard->nextButton, SIGNAL(clicked()), m_gallery, SLOT(nextSnapshot()));
+ connect(m_ui_diveDashboard->prevButton, SIGNAL(clicked()), m_gallery, SLOT(previousSnapshot()));
}
@@ -61,14 +69,6 @@
*/
void PicManager::load(const AbstractSequentialList& imageList)
{
- m_gallery = new Extra::Gallery( *(m_ui_diveDashboard->snapshotImage),
- *(m_ui_diveDashboard->nextButton), *(m_ui_diveDashboard->prevButton),
- *(m_ui_diveDashboard->nextPageButton), *(m_ui_diveDashboard->prevPageButton),
- this);
-
m_gallery->buildGallery(imageList);
m_gallery->changeActiveSnapshotInfo(1);
- m_ui_diveDashboard->snapshotImage->setScaledContents(true); //make pics fit viewport
- connect(m_ui_diveDashboard->nextButton, SIGNAL(clicked()), m_gallery, SLOT(nextSnapshot()));
- connect(m_ui_diveDashboard->prevButton, SIGNAL(clicked()), m_gallery, SLOT(previousSnapshot()));
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dec...@us...> - 2007-07-07 02:07:11
|
Revision: 28
http://frogface.svn.sourceforge.net/frogface/?rev=28&view=rev
Author: declanmcgrath
Date: 2007-07-06 19:07:09 -0700 (Fri, 06 Jul 2007)
Log Message:
-----------
Added fix to ensure images are scaled to correct size in dive pic list.
Modified Paths:
--------------
trunk/src/picmanager.cpp
Modified: trunk/src/picmanager.cpp
===================================================================
--- trunk/src/picmanager.cpp 2007-07-01 07:08:35 UTC (rev 27)
+++ trunk/src/picmanager.cpp 2007-07-07 02:07:09 UTC (rev 28)
@@ -66,7 +66,7 @@
this);
m_gallery->changeActiveSnapshotInfo(1);
-
+ m_ui_diveDashboard->snapshotImage->setScaledContents(true); //make pics fit viewport
connect(m_ui_diveDashboard->nextButton, SIGNAL(clicked()), m_gallery, SLOT(nextSnapshot()));
connect(m_ui_diveDashboard->prevButton, SIGNAL(clicked()), m_gallery, SLOT(previousSnapshot()));
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dec...@us...> - 2007-06-10 11:53:27
|
Revision: 24
http://frogface.svn.sourceforge.net/frogface/?rev=24&view=rev
Author: declanmcgrath
Date: 2007-06-10 04:53:25 -0700 (Sun, 10 Jun 2007)
Log Message:
-----------
Made Frogface compatible with KDevelop 3.5.5
Modified Paths:
--------------
trunk/Doxyfile
trunk/Makefile
trunk/bin/frogface
trunk/frogface.kdevelop
trunk/frogface.kdevelop.pcs
trunk/frogface.kdevses
trunk/src/Makefile
trunk/src/moc_abstractsequentialtablemodel.cpp
trunk/src/moc_buddylistmanager.cpp
trunk/src/moc_buddytablemodel.cpp
trunk/src/moc_divedashboard.cpp
trunk/src/moc_divelistmanager.cpp
trunk/src/moc_divesitetablemodel.cpp
trunk/src/moc_divetablemodel.cpp
trunk/src/moc_froggiemainwindow.cpp
trunk/src/moc_locationlistmanager.cpp
trunk/src/moc_locationtablemodel.cpp
trunk/src/moc_userprofilemanager.cpp
trunk/src/ui_divedashboardwidget.h
Modified: trunk/Doxyfile
===================================================================
--- trunk/Doxyfile 2007-06-09 23:24:47 UTC (rev 23)
+++ trunk/Doxyfile 2007-06-10 11:53:25 UTC (rev 24)
@@ -4,7 +4,7 @@
# Project related configuration options
#---------------------------------------------------------------------------
PROJECT_NAME = frogface.kdevelop
-PROJECT_NUMBER = 0.1
+PROJECT_NUMBER = 0.3
OUTPUT_DIRECTORY =
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2007-06-09 23:24:47 UTC (rev 23)
+++ trunk/Makefile 2007-06-10 11:53:25 UTC (rev 24)
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: frogface
-# Generated by qmake (2.01a) (Qt 4.3.0) on: Sat Jun 9 23:35:54 2007
+# Generated by qmake (2.01a) (Qt 4.3.0) on: Sun Jun 10 23:52:04 2007
# Project: frogface.pro
# Template: subdirs
# Command: /usr/local/Trolltech/Qt-4.3.0/bin/qmake -unix -o Makefile frogface.pro
@@ -50,43 +50,43 @@
sub-src-uninstall_subtargets: src//$(MAKEFILE) FORCE
cd src/ && $(MAKE) -f $(MAKEFILE) uninstall
-Makefile: frogface.pro /usr/local/Trolltech/Qt-4.3.0/mkspecs/linux-g++/qmake.conf /usr/local/Trolltech/Qt-4.3.0/mkspecs/common/g++.conf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/common/unix.conf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/common/linux.conf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/qconfig.pri \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt_functions.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt_config.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/exclusive_builds.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/default_pre.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/release.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/default_post.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/warn_on.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/unix/thread.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/moc.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/resources.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/uic.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/yacc.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/lex.prf
+Makefile: frogface.pro /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/linux-g++/qmake.conf /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/common/g++.conf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/common/unix.conf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/common/linux.conf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/qconfig.pri \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/qt_functions.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/qt_config.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/exclusive_builds.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/default_pre.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/release.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/default_post.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/warn_on.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/qt.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/unix/thread.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/moc.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/resources.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/uic.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/yacc.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/lex.prf
$(QMAKE) -unix -o Makefile frogface.pro
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/common/g++.conf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/common/unix.conf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/common/linux.conf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/qconfig.pri:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt_functions.prf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt_config.prf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/exclusive_builds.prf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/default_pre.prf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/release.prf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/default_post.prf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/warn_on.prf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt.prf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/unix/thread.prf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/moc.prf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/resources.prf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/uic.prf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/yacc.prf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/lex.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/common/g++.conf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/common/unix.conf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/common/linux.conf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/qconfig.pri:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/qt_functions.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/qt_config.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/exclusive_builds.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/default_pre.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/release.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/default_post.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/warn_on.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/qt.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/unix/thread.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/moc.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/resources.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/uic.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/yacc.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/lex.prf:
qmake: qmake_all FORCE
@$(QMAKE) -unix -o Makefile frogface.pro
Modified: trunk/bin/frogface
===================================================================
(Binary files differ)
Modified: trunk/frogface.kdevelop
===================================================================
--- trunk/frogface.kdevelop 2007-06-09 23:24:47 UTC (rev 23)
+++ trunk/frogface.kdevelop 2007-06-10 11:53:25 UTC (rev 24)
@@ -14,8 +14,6 @@
<absoluteprojectpath>false</absoluteprojectpath>
<description>A dive log for scuba divers. Frogface is a cross-platform desktop application for jotting down those priceless moments when you are surprised by a shark or amazed by an octapus. If it happens in the sea, log it in Frogface!</description>
<versioncontrol/>
- <projectname>frogface</projectname>
- <defaultencoding/>
</general>
<kdevfileview>
<groups>
@@ -90,18 +88,13 @@
</kdevdebugger>
<kdevtrollproject>
<run>
- <mainprogram>/home/jack/Projects/Subverted/frogface/trunk/bin/frogface</mainprogram>
+ <mainprogram>bin/frogface</mainprogram>
<programargs/>
<directoryradio>executable</directoryradio>
<customdirectory>/</customdirectory>
<terminal>false</terminal>
<autocompile>false</autocompile>
<envvars/>
- <globaldebugarguments/>
- <globalcwd>/home/jack/Projects/Subverted/frogface/trunk/bin</globalcwd>
- <useglobalprogram>true</useglobalprogram>
- <autoinstall>false</autoinstall>
- <autokdesu>false</autokdesu>
</run>
<general>
<activedir>src</activedir>
@@ -116,11 +109,6 @@
<envvars/>
</make>
<subclassing/>
- <qmake>
- <savebehaviour>2</savebehaviour>
- <replacePaths>false</replacePaths>
- <disableDefaultOpts>true</disableDefaultOpts>
- </qmake>
</kdevtrollproject>
<kdevfilecreate>
<filetypes/>
@@ -164,31 +152,11 @@
<codeCompletionDelay>250</codeCompletionDelay>
<argumentsHintDelay>400</argumentsHintDelay>
<headerCompletionDelay>250</headerCompletionDelay>
- <showOnlyAccessibleItems>false</showOnlyAccessibleItems>
- <completionBoxItemOrder>0</completionBoxItemOrder>
- <howEvaluationContextMenu>true</howEvaluationContextMenu>
- <showCommentWithArgumentHint>true</showCommentWithArgumentHint>
- <statusBarTypeEvaluation>false</statusBarTypeEvaluation>
- <namespaceAliases>std=_GLIBCXX_STD;__gnu_cxx=std</namespaceAliases>
- <processPrimaryTypes>true</processPrimaryTypes>
- <processFunctionArguments>false</processFunctionArguments>
- <preProcessAllHeaders>false</preProcessAllHeaders>
- <parseMissingHeaders>false</parseMissingHeaders>
- <resolveIncludePaths>true</resolveIncludePaths>
- <alwaysParseInBackground>true</alwaysParseInBackground>
- <usePermanentCaching>true</usePermanentCaching>
- <alwaysIncludeNamespaces>false</alwaysIncludeNamespaces>
- <includePaths>.;</includePaths>
</codecompletion>
<qt>
<used>true</used>
<version>4</version>
- <root>/home/gatto/qt-link</root>
- <includestyle>4</includestyle>
- <designerintegration>ExternalDesigner</designerintegration>
- <qmake>/usr/local/Trolltech/Qt-4.3.0/bin/qmake</qmake>
- <designer>/usr/local/Trolltech/Qt-4.3.0/bin/designer</designer>
- <designerpluginpaths/>
+ <root>/usr/local/Trolltech/Qt-4.3.0</root>
</qt>
<creategettersetter>
<prefixGet/>
@@ -198,11 +166,6 @@
<inlineGet>true</inlineGet>
<inlineSet>true</inlineSet>
</creategettersetter>
- <splitheadersource>
- <enabled>false</enabled>
- <synchronize>true</synchronize>
- <orientation>Vertical</orientation>
- </splitheadersource>
</kdevcppsupport>
<cppsupportpart>
<filetemplates>
Modified: trunk/frogface.kdevelop.pcs
===================================================================
(Binary files differ)
Modified: trunk/frogface.kdevses
===================================================================
--- trunk/frogface.kdevses 2007-06-09 23:24:47 UTC (rev 23)
+++ trunk/frogface.kdevses 2007-06-10 11:53:25 UTC (rev 24)
@@ -1,42 +1,116 @@
<?xml version = '1.0' encoding = 'UTF-8'?>
<!DOCTYPE KDevPrjSession>
<KDevPrjSession>
- <DocsAndViews NumberOfDocuments="4" >
- <Doc0 NumberOfViews="1" URL="file:///home/jack/Projects/Subverted/frogface/trunk/src/buddylistmanager.cpp" >
- <View0 Encoding="" line="303" Type="Source" />
+ <DocsAndViews NumberOfDocuments="12" >
+ <Doc0 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divelistmanager.h" >
+ <View0 Type="Source" />
</Doc0>
- <Doc1 NumberOfViews="1" URL="file:///home/jack/Projects/Subverted/frogface/trunk/src/divelistmanager.cpp" >
- <View0 Encoding="" line="135" Type="Source" />
+ <Doc1 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/buddy.h" >
+ <View0 Type="Source" />
</Doc1>
- <Doc2 NumberOfViews="1" URL="file:///home/jack/Projects/Subverted/frogface/trunk/src/tablehelper.cpp" >
- <View0 Encoding="" line="163" Type="Source" />
+ <Doc2 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divedashboard.h" >
+ <View0 Type="Source" />
</Doc2>
- <Doc3 NumberOfViews="1" URL="file:///home/jack/Projects/Subverted/frogface/trunk/src/divedashboard.cpp" >
- <View0 Encoding="" line="55" Type="Source" />
+ <Doc3 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divedashboard.cpp" >
+ <View0 Type="Source" />
</Doc3>
+ <Doc4 NumberOfViews="1" URL="file:///usr/include/QtCore/qstring.h" >
+ <View0 Type="Source" />
+ </Doc4>
+ <Doc5 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/buddylistmanager.cpp" >
+ <View0 Type="Source" />
+ </Doc5>
+ <Doc6 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/userprofilemanager.cpp" >
+ <View0 Type="Source" />
+ </Doc6>
+ <Doc7 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/abstractserialisable.cpp" >
+ <View0 Type="Source" />
+ </Doc7>
+ <Doc8 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/userprofile.cpp" >
+ <View0 Type="Source" />
+ </Doc8>
+ <Doc9 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/crudpanelmanager.cpp" >
+ <View0 Type="Source" />
+ </Doc9>
+ <Doc10 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/abstractrecordsetmanager.cpp" >
+ <View0 Type="Source" />
+ </Doc10>
+ <Doc11 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divelistmanager.cpp" >
+ <View0 line="119" Type="Source" />
+ </Doc11>
</DocsAndViews>
<pluginList>
<kdevdebugger>
<breakpointList>
- <breakpoint0 location="/home/jack/Projects/Subverted/frogface/trunk/src/tablehelper.cpp:148" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <breakpoint0 location="/mnt/extra/Projects/frogface-sc/branches/release-2.0.2/src/locationlistmanager.cpp:138" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
<tracedExpressions/>
</breakpoint0>
- <breakpoint1 location="/home/jack/Projects/Subverted/frogface/trunk/src/divelistmanager.cpp:136" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <breakpoint1 location="/mnt/extra/Projects/frogface-sc/branches/release-2.0.2/src/locationlistmanager.cpp:136" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
<tracedExpressions/>
</breakpoint1>
+ <breakpoint2 location="/mnt/extra/Projects/frogface-sc/branches/release-2.0.2/src/userprofilemanager.cpp:262" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <tracedExpressions/>
+ </breakpoint2>
+ <breakpoint3 location="/mnt/extra/Projects/frogface-sc/branches/release-2.0.2/src/divedashboard.cpp:44" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <tracedExpressions/>
+ </breakpoint3>
+ <breakpoint4 location="/mnt/extra/Projects/frogface-sc/branches/release-2.0.2/src/divedashboard.cpp:46" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <tracedExpressions/>
+ </breakpoint4>
+ <breakpoint5 location="/mnt/extra/Projects/frogface-sc/branches/release-2.0.2/src/divedashboard.cpp:175" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <tracedExpressions/>
+ </breakpoint5>
+ <breakpoint6 location="/mnt/extra/Projects/frogface-sc/branches/release-2.0.2/src/divedashboard.cpp:163" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <tracedExpressions/>
+ </breakpoint6>
+ <breakpoint7 location="/mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/sequencenumbermanager.cpp:79" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <tracedExpressions/>
+ </breakpoint7>
+ <breakpoint8 location="/mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/buddylistmanager.cpp:217" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <tracedExpressions/>
+ </breakpoint8>
+ <breakpoint9 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/crudpanelmanager.cpp:38" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <tracedExpressions/>
+ </breakpoint9>
+ <breakpoint10 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/userprofilemanager.cpp:179" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <tracedExpressions/>
+ </breakpoint10>
+ <breakpoint11 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/userprofilemanager.cpp:98" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <tracedExpressions/>
+ </breakpoint11>
+ <breakpoint12 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/userprofilemanager.cpp:94" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <tracedExpressions/>
+ </breakpoint12>
+ <breakpoint13 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/userprofilemanager.cpp:180" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <tracedExpressions/>
+ </breakpoint13>
+ <breakpoint14 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/userprofilemanager.cpp:99" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <tracedExpressions/>
+ </breakpoint14>
+ <breakpoint15 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/userprofilemanager.cpp:76" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <tracedExpressions/>
+ </breakpoint15>
</breakpointList>
- <showInternalCommands value="0" />
</kdevdebugger>
- <kdevastyle>
- <Extensions ext="*.cpp *.h,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff,*.inl,*.java,*.moc,*.patch,*.tlh,*.xpm" />
- <AStyle IndentPreprocessors="0" FillCount="4" PadParenthesesOut="1" IndentNamespaces="1" IndentLabels="1" Fill="Tabs" MaxStatement="40" Brackets="Break" MinConditional="-1" IndentBrackets="0" PadParenthesesUn="1" BlockBreak="0" KeepStatements="1" KeepBlocks="1" BlockIfElse="0" IndentSwitches="1" PadOperators="0" FStyle="UserDefined" IndentCases="0" FillEmptyLines="0" BracketsCloseHeaders="0" BlockBreakAll="0" PadParenthesesIn="1" IndentClasses="1" IndentBlocks="0" FillForce="0" />
- </kdevastyle>
<kdevbookmarks>
- <bookmarks/>
+ <bookmarks>
+ <bookmark url="/home/bluedog/Projects/frogface/src/divedashboard.cpp" >
+ <mark line="867" />
+ </bookmark>
+ <bookmark url="/home/bluedog/Projects/working_copies/frogface-sc/branches/release-2.0.1/src/divesitetablemodel.cpp" >
+ <mark line="126" />
+ </bookmark>
+ <bookmark url="/mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/buddylistmanager.h" >
+ <mark line="42" />
+ </bookmark>
+ <bookmark url="/home/jackson/Projects/frogface/src/divetablemodel.cpp" >
+ <mark line="142" />
+ </bookmark>
+ </bookmarks>
</kdevbookmarks>
<kdevvalgrind>
<executable path="" params="" />
- <valgrind path="" params="" />
+ <valgrind path="valgrind" params="--tool=memcheck --tool=memcheck --leak-check=yes" />
<calltree path="" params="" />
<kcachegrind path="" />
</kdevvalgrind>
Modified: trunk/src/Makefile
===================================================================
--- trunk/src/Makefile 2007-06-09 23:24:47 UTC (rev 23)
+++ trunk/src/Makefile 2007-06-10 11:53:25 UTC (rev 24)
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: ../bin/frogface
-# Generated by qmake (2.01a) (Qt 4.3.0) on: Sat Jun 9 23:35:55 2007
+# Generated by qmake (2.01a) (Qt 4.3.0) on: Sun Jun 10 23:31:35 2007
# Project: src.pro
# Template: app
# Command: /usr/local/Trolltech/Qt-4.3.0/bin/qmake -unix -o Makefile src.pro
@@ -13,10 +13,10 @@
DEFINES = -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
CFLAGS = -pipe -g -D_REENTRANT -w $(DEFINES)
CXXFLAGS = -pipe -g -ggdb -D_REENTRANT -w $(DEFINES)
-INCPATH = -I/usr/local/Trolltech/Qt-4.3.0/mkspecs/linux-g++ -I. -I/usr/local/Trolltech/Qt-4.3.0/include/QtCore -I/usr/local/Trolltech/Qt-4.3.0/include/QtCore -I/usr/local/Trolltech/Qt-4.3.0/include/QtGui -I/usr/local/Trolltech/Qt-4.3.0/include/QtGui -I/usr/local/Trolltech/Qt-4.3.0/include/QtXml -I/usr/local/Trolltech/Qt-4.3.0/include/QtXml -I/usr/local/Trolltech/Qt-4.3.0/include -I. -I.
+INCPATH = -I/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/linux-g++ -I. -I/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/include/QtCore -I/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/include/QtCore -I/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/include/QtGui -I/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/include/QtGui -I/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/include/QtXml -I/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/include/QtXml -I/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/include -I. -I.
LINK = g++
LFLAGS = -Wl,-rpath,/usr/local/Trolltech/Qt-4.3.0/lib
-LIBS = $(SUBLIBS) -L/usr/local/Trolltech/Qt-4.3.0/lib -lQtXml -L/usr/local/Trolltech/Qt-4.3.0/lib -pthread -pthread -lQtGui -L/usr/X11R6/lib -lpng -lSM -lICE -pthread -pthread -lXi -lXrender -lXrandr -lXfixes -lXcursor -lXinerama -lfreetype -lfontconfig -lXext -lX11 -lQtCore -lz -lm -pthread -lgthread-2.0 -lrt -lglib-2.0 -ldl -lpthread
+LIBS = $(SUBLIBS) -L/usr/local/Trolltech/Qt-4.3.0/lib -lQtXml -L/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/lib -pthread -L/opt/gnome/lib -pthread -lQtGui -L/usr/X11R6/lib -lpng -lSM -lICE -pthread -pthread -lXi -lXrender -lXrandr -lXfixes -lXcursor -lXinerama -lfreetype -lfontconfig -lXext -lX11 -lQtCore -lz -lm -pthread -lgthread-2.0 -lglib-2.0 -lrt -ldl -lpthread
AR = ar cqs
RANLIB =
QMAKE = /usr/local/Trolltech/Qt-4.3.0/bin/qmake
@@ -153,24 +153,24 @@
moc_froggiemainwindow.o \
moc_buddytablemodel.o \
moc_buddylistmanager.o
-DIST = /usr/local/Trolltech/Qt-4.3.0/mkspecs/common/g++.conf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/common/unix.conf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/common/linux.conf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/qconfig.pri \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt_functions.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt_config.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/exclusive_builds.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/default_pre.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/debug.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/default_post.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/unix/thread.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/moc.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/warn_off.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/resources.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/uic.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/yacc.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/lex.prf \
+DIST = /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/common/g++.conf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/common/unix.conf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/common/linux.conf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/qconfig.pri \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/qt_functions.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/qt_config.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/exclusive_builds.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/default_pre.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/debug.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/default_post.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/qt.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/unix/thread.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/moc.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/warn_off.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/resources.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/uic.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/yacc.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/lex.prf \
src.pro
QMAKE_TARGET = frogface
DESTDIR = ../bin/
@@ -204,46 +204,46 @@
@$(CHK_DIR_EXISTS) ../bin/ || $(MKDIR) ../bin/
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
-Makefile: src.pro /usr/local/Trolltech/Qt-4.3.0/mkspecs/linux-g++/qmake.conf /usr/local/Trolltech/Qt-4.3.0/mkspecs/common/g++.conf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/common/unix.conf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/common/linux.conf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/qconfig.pri \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt_functions.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt_config.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/exclusive_builds.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/default_pre.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/debug.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/default_post.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/unix/thread.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/moc.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/warn_off.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/resources.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/uic.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/yacc.prf \
- /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/lex.prf \
+Makefile: src.pro /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/linux-g++/qmake.conf /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/common/g++.conf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/common/unix.conf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/common/linux.conf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/qconfig.pri \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/qt_functions.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/qt_config.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/exclusive_builds.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/default_pre.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/debug.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/default_post.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/qt.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/unix/thread.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/moc.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/warn_off.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/resources.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/uic.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/yacc.prf \
+ /mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/lex.prf \
/usr/local/Trolltech/Qt-4.3.0/lib/libQtXml.prl \
/usr/local/Trolltech/Qt-4.3.0/lib/libQtCore.prl \
/usr/local/Trolltech/Qt-4.3.0/lib/libQtGui.prl
$(QMAKE) -unix -o Makefile src.pro
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/common/g++.conf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/common/unix.conf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/common/linux.conf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/qconfig.pri:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt_functions.prf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt_config.prf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/exclusive_builds.prf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/default_pre.prf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/debug.prf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/default_post.prf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt.prf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/unix/thread.prf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/moc.prf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/warn_off.prf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/resources.prf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/uic.prf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/yacc.prf:
-/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/lex.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/common/g++.conf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/common/unix.conf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/common/linux.conf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/qconfig.pri:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/qt_functions.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/qt_config.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/exclusive_builds.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/default_pre.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/debug.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/default_post.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/qt.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/unix/thread.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/moc.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/warn_off.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/resources.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/uic.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/yacc.prf:
+/mnt/extra/NotBackedUp/qt4-built/Trolltech/Qt-4.3.0/mkspecs/features/lex.prf:
/usr/local/Trolltech/Qt-4.3.0/lib/libQtXml.prl:
/usr/local/Trolltech/Qt-4.3.0/lib/libQtCore.prl:
/usr/local/Trolltech/Qt-4.3.0/lib/libQtGui.prl:
@@ -1063,7 +1063,7 @@
install_sources: first FORCE
@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/Trolltech/Qt-4.3.0/demos/sqlbrowser/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/Trolltech/Qt-4.3.0/demos/sqlbrowser/
- -$(INSTALL_FILE) /home/jack/Projects/Subverted/frogface/trunk/src/src.pro $(INSTALL_ROOT)/usr/local/Trolltech/Qt-4.3.0/demos/sqlbrowser/
+ -$(INSTALL_FILE) /mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/src.pro $(INSTALL_ROOT)/usr/local/Trolltech/Qt-4.3.0/demos/sqlbrowser/
uninstall_sources: FORCE
@@ -1072,12 +1072,12 @@
install_target: first FORCE
- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/home/jack/Projects/Subverted/frogface/trunk/src/./bin/ || $(MKDIR) $(INSTALL_ROOT)/home/jack/Projects/Subverted/frogface/trunk/src/./bin/
- -$(INSTALL_PROGRAM) "../bin/$(QMAKE_TARGET)" "$(INSTALL_ROOT)/home/jack/Projects/Subverted/frogface/trunk/src/bin/$(QMAKE_TARGET)"
+ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/./bin/ || $(MKDIR) $(INSTALL_ROOT)/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/./bin/
+ -$(INSTALL_PROGRAM) "../bin/$(QMAKE_TARGET)" "$(INSTALL_ROOT)/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/bin/$(QMAKE_TARGET)"
uninstall_target: FORCE
- -$(DEL_FILE) "$(INSTALL_ROOT)/home/jack/Projects/Subverted/frogface/trunk/src/bin/$(QMAKE_TARGET)"
- -$(DEL_DIR) $(INSTALL_ROOT)/home/jack/Projects/Subverted/frogface/trunk/src/./bin/
+ -$(DEL_FILE) "$(INSTALL_ROOT)/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/bin/$(QMAKE_TARGET)"
+ -$(DEL_DIR) $(INSTALL_ROOT)/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/./bin/
install: install_sources install_target FORCE
Modified: trunk/src/moc_abstractsequentialtablemodel.cpp
===================================================================
--- trunk/src/moc_abstractsequentialtablemodel.cpp 2007-06-09 23:24:47 UTC (rev 23)
+++ trunk/src/moc_abstractsequentialtablemodel.cpp 2007-06-10 11:53:25 UTC (rev 24)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'abstractsequentialtablemodel.h'
**
-** Created: Sat Jun 9 23:36:50 2007
+** Created: Sun Jun 10 23:37:36 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_buddylistmanager.cpp
===================================================================
--- trunk/src/moc_buddylistmanager.cpp 2007-06-09 23:24:47 UTC (rev 23)
+++ trunk/src/moc_buddylistmanager.cpp 2007-06-10 11:53:25 UTC (rev 24)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'buddylistmanager.h'
**
-** Created: Sat Jun 9 23:36:58 2007
+** Created: Sun Jun 10 23:38:37 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_buddytablemodel.cpp
===================================================================
--- trunk/src/moc_buddytablemodel.cpp 2007-06-09 23:24:47 UTC (rev 23)
+++ trunk/src/moc_buddytablemodel.cpp 2007-06-10 11:53:25 UTC (rev 24)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'buddytablemodel.h'
**
-** Created: Sat Jun 9 23:36:57 2007
+** Created: Sun Jun 10 23:38:30 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_divedashboard.cpp
===================================================================
--- trunk/src/moc_divedashboard.cpp 2007-06-09 23:24:47 UTC (rev 23)
+++ trunk/src/moc_divedashboard.cpp 2007-06-10 11:53:25 UTC (rev 24)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divedashboard.h'
**
-** Created: Sat Jun 9 23:36:46 2007
+** Created: Sun Jun 10 23:37:07 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_divelistmanager.cpp
===================================================================
--- trunk/src/moc_divelistmanager.cpp 2007-06-09 23:24:47 UTC (rev 23)
+++ trunk/src/moc_divelistmanager.cpp 2007-06-10 11:53:25 UTC (rev 24)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divelistmanager.h'
**
-** Created: Sat Jun 9 23:36:51 2007
+** Created: Sun Jun 10 23:37:43 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_divesitetablemodel.cpp
===================================================================
--- trunk/src/moc_divesitetablemodel.cpp 2007-06-09 23:24:47 UTC (rev 23)
+++ trunk/src/moc_divesitetablemodel.cpp 2007-06-10 11:53:25 UTC (rev 24)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divesitetablemodel.h'
**
-** Created: Sat Jun 9 23:36:48 2007
+** Created: Sun Jun 10 23:37:22 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_divetablemodel.cpp
===================================================================
--- trunk/src/moc_divetablemodel.cpp 2007-06-09 23:24:47 UTC (rev 23)
+++ trunk/src/moc_divetablemodel.cpp 2007-06-10 11:53:25 UTC (rev 24)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divetablemodel.h'
**
-** Created: Sat Jun 9 23:36:44 2007
+** Created: Sun Jun 10 23:37:00 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_froggiemainwindow.cpp
===================================================================
--- trunk/src/moc_froggiemainwindow.cpp 2007-06-09 23:24:47 UTC (rev 23)
+++ trunk/src/moc_froggiemainwindow.cpp 2007-06-10 11:53:25 UTC (rev 24)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'froggiemainwindow.h'
**
-** Created: Sat Jun 9 23:36:55 2007
+** Created: Sun Jun 10 23:38:15 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_locationlistmanager.cpp
===================================================================
--- trunk/src/moc_locationlistmanager.cpp 2007-06-09 23:24:47 UTC (rev 23)
+++ trunk/src/moc_locationlistmanager.cpp 2007-06-10 11:53:25 UTC (rev 24)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'locationlistmanager.h'
**
-** Created: Sat Jun 9 23:36:52 2007
+** Created: Sun Jun 10 23:37:53 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_locationtablemodel.cpp
===================================================================
--- trunk/src/moc_locationtablemodel.cpp 2007-06-09 23:24:47 UTC (rev 23)
+++ trunk/src/moc_locationtablemodel.cpp 2007-06-10 11:53:25 UTC (rev 24)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'locationtablemodel.h'
**
-** Created: Sat Jun 9 23:36:49 2007
+** Created: Sun Jun 10 23:37:29 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_userprofilemanager.cpp
===================================================================
--- trunk/src/moc_userprofilemanager.cpp 2007-06-09 23:24:47 UTC (rev 23)
+++ trunk/src/moc_userprofilemanager.cpp 2007-06-10 11:53:25 UTC (rev 24)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'userprofilemanager.h'
**
-** Created: Sat Jun 9 23:36:54 2007
+** Created: Sun Jun 10 23:38:04 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.3.0)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/ui_divedashboardwidget.h
===================================================================
--- trunk/src/ui_divedashboardwidget.h 2007-06-09 23:24:47 UTC (rev 23)
+++ trunk/src/ui_divedashboardwidget.h 2007-06-10 11:53:25 UTC (rev 24)
@@ -1,7 +1,7 @@
/********************************************************************************
** Form generated from reading ui file 'divedashboardwidget.ui'
**
-** Created: Sat Jun 9 23:35:57 2007
+** Created: Sun Jun 10 23:31:39 2007
** by: Qt User Interface Compiler version 4.3.0
**
** WARNING! All changes made in this file will be lost when recompiling ui file!
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dec...@us...> - 2007-06-09 02:34:15
|
Revision: 22
http://frogface.svn.sourceforge.net/frogface/?rev=22&view=rev
Author: declanmcgrath
Date: 2007-06-08 19:34:15 -0700 (Fri, 08 Jun 2007)
Log Message:
-----------
Minor changes to data only. Haven't looked at ol froggie in a while and
commiting so that I can wipe the slate clean again
Modified Paths:
--------------
trunk/bin/data/debug_info/newProfile_DEBUG_OUTER.xml
trunk/bin/data/debug_info/userProfile_DEBUG_INNER.xml
trunk/bin/data/myProfilePic.jpg
trunk/frogface.kdevelop.pcs
trunk/frogface.kdevses
Modified: trunk/bin/data/debug_info/newProfile_DEBUG_OUTER.xml
===================================================================
--- trunk/bin/data/debug_info/newProfile_DEBUG_OUTER.xml 2007-05-22 14:48:26 UTC (rev 21)
+++ trunk/bin/data/debug_info/newProfile_DEBUG_OUTER.xml 2007-06-09 02:34:15 UTC (rev 22)
@@ -1,12 +1,12 @@
<!DOCTYPE none>
<userprofile>
- <firstname>Declan</firstname>
- <surname>Mc/Grath</surname>
- <nickname>Jackson</nickname>
- <divingstyle>Relaxed</divingstyle>
- <certification>PADI DM</certification>
- <bestdive>no 1</bestdive>
- <email>h@a.cpom</email>
- <phonenumber>38475094356</phonenumber>
+ <firstname>David</firstname>
+ <surname>Jones</surname>
+ <nickname>Frogman</nickname>
+ <divingstyle>Edgy</divingstyle>
+ <certification>PADI DIvemaster</certification>
+ <bestdive>My first wreck dive</bestdive>
+ <email>da...@ho...</email>
+ <phonenumber>02198434</phonenumber>
<picturefilename>data/myProfilePic.jpg</picturefilename>
</userprofile>
Modified: trunk/bin/data/debug_info/userProfile_DEBUG_INNER.xml
===================================================================
--- trunk/bin/data/debug_info/userProfile_DEBUG_INNER.xml 2007-05-22 14:48:26 UTC (rev 21)
+++ trunk/bin/data/debug_info/userProfile_DEBUG_INNER.xml 2007-06-09 02:34:15 UTC (rev 22)
@@ -1,12 +1,12 @@
<!DOCTYPE none>
<userprofile>
- <firstname>Declan</firstname>
- <surname>Mc/Grath</surname>
- <nickname>Jackson</nickname>
- <divingstyle>Relaxed</divingstyle>
- <certification>PADI DM</certification>
- <bestdive>no 1</bestdive>
- <email>h@a.cpom</email>
- <phonenumber>38475094356</phonenumber>
+ <firstname>David</firstname>
+ <surname>Jones</surname>
+ <nickname>Frogman</nickname>
+ <divingstyle>Edgy</divingstyle>
+ <certification>PADI DIvemaster</certification>
+ <bestdive>My first wreck dive</bestdive>
+ <email>da...@ho...</email>
+ <phonenumber>02198434</phonenumber>
<picturefilename>data/myProfilePic.jpg</picturefilename>
</userprofile>
Modified: trunk/bin/data/myProfilePic.jpg
===================================================================
(Binary files differ)
Modified: trunk/frogface.kdevelop.pcs
===================================================================
(Binary files differ)
Modified: trunk/frogface.kdevses
===================================================================
--- trunk/frogface.kdevses 2007-05-22 14:48:26 UTC (rev 21)
+++ trunk/frogface.kdevses 2007-06-09 02:34:15 UTC (rev 22)
@@ -39,7 +39,7 @@
<View0 Type="Source" />
</Doc11>
<Doc12 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divelistmanager.cpp" >
- <View0 line="129" Type="Source" />
+ <View0 line="136" Type="Source" />
</Doc12>
</DocsAndViews>
<pluginList>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dec...@us...> - 2007-05-21 10:18:50
|
Revision: 20
http://frogface.svn.sourceforge.net/frogface/?rev=20&view=rev
Author: declanmcgrath
Date: 2007-05-21 03:18:51 -0700 (Mon, 21 May 2007)
Log Message:
-----------
Bugs fixed:
1721744 'Your Profile' has New/Delete Buttons
Modified Paths:
--------------
trunk/bin/frogface
trunk/frogface.kdevelop.pcs
trunk/frogface.kdevses
trunk/src/divedashboardwidget.ui
trunk/src/moc_abstractsequentialtablemodel.cpp
trunk/src/moc_buddylistmanager.cpp
trunk/src/moc_buddytablemodel.cpp
trunk/src/moc_divedashboard.cpp
trunk/src/moc_divelistmanager.cpp
trunk/src/moc_divesitetablemodel.cpp
trunk/src/moc_divetablemodel.cpp
trunk/src/moc_froggiemainwindow.cpp
trunk/src/moc_locationlistmanager.cpp
trunk/src/moc_locationtablemodel.cpp
trunk/src/moc_userprofilemanager.cpp
trunk/src/ui_divedashboardwidget.h
trunk/src/userprofilemanager.cpp
Modified: trunk/bin/frogface
===================================================================
(Binary files differ)
Modified: trunk/frogface.kdevelop.pcs
===================================================================
(Binary files differ)
Modified: trunk/frogface.kdevses
===================================================================
--- trunk/frogface.kdevses 2007-05-19 11:22:55 UTC (rev 19)
+++ trunk/frogface.kdevses 2007-05-21 10:18:51 UTC (rev 20)
@@ -1,73 +1,46 @@
<?xml version = '1.0' encoding = 'UTF-8'?>
<!DOCTYPE KDevPrjSession>
<KDevPrjSession>
- <DocsAndViews NumberOfDocuments="22" >
- <Doc0 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/main.cpp" >
- <View0 Type="Source" />
+ <DocsAndViews NumberOfDocuments="13" >
+ <Doc0 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divelistmanager.h" >
+ <View0 line="148" Type="Source" />
</Doc0>
- <Doc1 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/abstractrecord.h" >
- <View0 Type="Source" />
+ <Doc1 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/buddy.h" >
+ <View0 line="31" Type="Source" />
</Doc1>
- <Doc2 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/abstractrecord.cpp" >
- <View0 Type="Source" />
+ <Doc2 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divedashboard.h" >
+ <View0 line="60" Type="Source" />
</Doc2>
- <Doc3 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/abstractrecordlist.h" >
- <View0 Type="Source" />
+ <Doc3 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divedashboard.cpp" >
+ <View0 line="254" Type="Source" />
</Doc3>
- <Doc4 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/abstractserialisable.h" >
- <View0 Type="Source" />
+ <Doc4 NumberOfViews="1" URL="file:///usr/include/QtCore/qstring.h" >
+ <View0 line="341" Type="Source" />
</Doc4>
- <Doc5 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/abstractserialisable.cpp" >
- <View0 Type="Source" />
+ <Doc5 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/buddylistmanager.cpp" >
+ <View0 line="69" Type="Source" />
</Doc5>
- <Doc6 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/sequencenumbermanager.h" >
- <View0 Type="Source" />
+ <Doc6 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/userprofilemanager.cpp" >
+ <View0 line="69" Type="Source" />
</Doc6>
- <Doc7 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/sequencenumbermanager.cpp" >
- <View0 Type="Source" />
+ <Doc7 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/abstractserialisable.cpp" >
+ <View0 line="75" Type="Source" />
</Doc7>
- <Doc8 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/ui_divedashboardwidget.h" >
- <View0 Type="Source" />
+ <Doc8 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/userprofile.cpp" >
+ <View0 line="145" Type="Source" />
</Doc8>
- <Doc9 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/divedashboard.h" >
- <View0 Type="Source" />
+ <Doc9 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/moc_divedashboard.cpp" >
+ <View0 line="106" Type="Source" />
</Doc9>
- <Doc10 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/divelistmanager.h" >
- <View0 Type="Source" />
+ <Doc10 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/crudpanelmanager.cpp" >
+ <View0 line="37" Type="Source" />
</Doc10>
- <Doc11 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/divelistmanager.cpp" >
- <View0 Type="Source" />
+ <Doc11 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/abstractrecordsetmanager.cpp" >
+ <View0 line="30" Type="Source" />
</Doc11>
- <Doc12 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/buddytablemodel.h" >
- <View0 Type="Source" />
+ <Doc12 NumberOfViews="1" URL="file:///mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/divelistmanager.cpp" >
+ <View0 line="127" Type="Source" />
</Doc12>
- <Doc13 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/buddytablemodel.cpp" >
- <View0 Type="Source" />
- </Doc13>
- <Doc14 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/divesitetablemodel.h" >
- <View0 Type="Source" />
- </Doc14>
- <Doc15 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/divesitetablemodel.cpp" >
- <View0 Type="Source" />
- </Doc15>
- <Doc16 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/countrytablemodel.h" >
- <View0 Type="Source" />
- </Doc16>
- <Doc17 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/countrytablemodel.cpp" >
- <View0 Type="Source" />
- </Doc17>
- <Doc18 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/locationtablemodel.h" >
- <View0 Type="Source" />
- </Doc18>
- <Doc19 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/locationtablemodel.cpp" >
- <View0 Type="Source" />
- </Doc19>
- <Doc20 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/dive.h" >
- <View0 Type="Source" />
- </Doc20>
- <Doc21 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/dive.cpp" >
- <View0 line="378" Type="Source" />
- </Doc21>
</DocsAndViews>
<pluginList>
<kdevdebugger>
@@ -99,6 +72,27 @@
<breakpoint8 location="/mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/buddylistmanager.cpp:217" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
<tracedExpressions/>
</breakpoint8>
+ <breakpoint9 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/crudpanelmanager.cpp:38" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <tracedExpressions/>
+ </breakpoint9>
+ <breakpoint10 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/userprofilemanager.cpp:179" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <tracedExpressions/>
+ </breakpoint10>
+ <breakpoint11 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/userprofilemanager.cpp:98" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <tracedExpressions/>
+ </breakpoint11>
+ <breakpoint12 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/userprofilemanager.cpp:94" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <tracedExpressions/>
+ </breakpoint12>
+ <breakpoint13 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/userprofilemanager.cpp:180" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <tracedExpressions/>
+ </breakpoint13>
+ <breakpoint14 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/userprofilemanager.cpp:99" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <tracedExpressions/>
+ </breakpoint14>
+ <breakpoint15 location="/mnt/extra/BackedUp/Projects/Subverted/frogface/trunk/src/userprofilemanager.cpp:76" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
+ <tracedExpressions/>
+ </breakpoint15>
</breakpointList>
</kdevdebugger>
<kdevbookmarks>
Modified: trunk/src/divedashboardwidget.ui
===================================================================
--- trunk/src/divedashboardwidget.ui 2007-05-19 11:22:55 UTC (rev 19)
+++ trunk/src/divedashboardwidget.ui 2007-05-21 10:18:51 UTC (rev 20)
@@ -501,7 +501,7 @@
<item>
<widget class="QTabWidget" name="contextTabHolder" >
<property name="currentIndex" >
- <number>3</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="diveListTabPage" >
<attribute name="title" >
@@ -760,7 +760,7 @@
</size>
</property>
<property name="currentIndex" >
- <number>6</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="diveBriefTabPage" >
<attribute name="title" >
@@ -2507,34 +2507,34 @@
<string>Delete</string>
</property>
</widget>
- <widget class="QPushButton" name="newRecordButton" >
+ <widget class="QPushButton" name="cancelActivityButton" >
<property name="geometry" >
<rect>
- <x>150</x>
+ <x>30</x>
<y>0</y>
- <width>41</width>
+ <width>31</width>
<height>25</height>
</rect>
</property>
<property name="text" >
- <string>New</string>
+ <string/>
</property>
+ <property name="icon" >
+ <iconset>../pics/x.png</iconset>
+ </property>
</widget>
- <widget class="QPushButton" name="cancelActivityButton" >
+ <widget class="QPushButton" name="newRecordButton" >
<property name="geometry" >
<rect>
- <x>30</x>
+ <x>150</x>
<y>0</y>
- <width>31</width>
+ <width>41</width>
<height>25</height>
</rect>
</property>
<property name="text" >
- <string/>
+ <string>New</string>
</property>
- <property name="icon" >
- <iconset>../pics/x.png</iconset>
- </property>
</widget>
</widget>
</item>
Modified: trunk/src/moc_abstractsequentialtablemodel.cpp
===================================================================
--- trunk/src/moc_abstractsequentialtablemodel.cpp 2007-05-19 11:22:55 UTC (rev 19)
+++ trunk/src/moc_abstractsequentialtablemodel.cpp 2007-05-21 10:18:51 UTC (rev 20)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'abstractsequentialtablemodel.h'
**
-** Created: Sat May 19 22:57:57 2007
+** Created: Mon May 21 22:00:53 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_buddylistmanager.cpp
===================================================================
--- trunk/src/moc_buddylistmanager.cpp 2007-05-19 11:22:55 UTC (rev 19)
+++ trunk/src/moc_buddylistmanager.cpp 2007-05-21 10:18:51 UTC (rev 20)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'buddylistmanager.h'
**
-** Created: Sat May 19 22:58:27 2007
+** Created: Mon May 21 22:02:37 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_buddytablemodel.cpp
===================================================================
--- trunk/src/moc_buddytablemodel.cpp 2007-05-19 11:22:55 UTC (rev 19)
+++ trunk/src/moc_buddytablemodel.cpp 2007-05-21 10:18:51 UTC (rev 20)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'buddytablemodel.h'
**
-** Created: Sat May 19 22:58:24 2007
+** Created: Mon May 21 22:02:29 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_divedashboard.cpp
===================================================================
--- trunk/src/moc_divedashboard.cpp 2007-05-19 11:22:55 UTC (rev 19)
+++ trunk/src/moc_divedashboard.cpp 2007-05-21 10:18:51 UTC (rev 20)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divedashboard.h'
**
-** Created: Sat May 19 22:57:42 2007
+** Created: Mon May 21 22:00:14 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_divelistmanager.cpp
===================================================================
--- trunk/src/moc_divelistmanager.cpp 2007-05-19 11:22:55 UTC (rev 19)
+++ trunk/src/moc_divelistmanager.cpp 2007-05-21 10:18:51 UTC (rev 20)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divelistmanager.h'
**
-** Created: Sat May 19 22:58:00 2007
+** Created: Mon May 21 22:01:04 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_divesitetablemodel.cpp
===================================================================
--- trunk/src/moc_divesitetablemodel.cpp 2007-05-19 11:22:55 UTC (rev 19)
+++ trunk/src/moc_divesitetablemodel.cpp 2007-05-21 10:18:51 UTC (rev 20)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divesitetablemodel.h'
**
-** Created: Sat May 19 22:57:50 2007
+** Created: Mon May 21 22:00:35 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_divetablemodel.cpp
===================================================================
--- trunk/src/moc_divetablemodel.cpp 2007-05-19 11:22:55 UTC (rev 19)
+++ trunk/src/moc_divetablemodel.cpp 2007-05-21 10:18:51 UTC (rev 20)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divetablemodel.h'
**
-** Created: Sat May 19 22:57:38 2007
+** Created: Mon May 21 22:00:00 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_froggiemainwindow.cpp
===================================================================
--- trunk/src/moc_froggiemainwindow.cpp 2007-05-19 11:22:55 UTC (rev 19)
+++ trunk/src/moc_froggiemainwindow.cpp 2007-05-21 10:18:51 UTC (rev 20)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'froggiemainwindow.h'
**
-** Created: Sat May 19 22:58:16 2007
+** Created: Mon May 21 22:02:02 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_locationlistmanager.cpp
===================================================================
--- trunk/src/moc_locationlistmanager.cpp 2007-05-19 11:22:55 UTC (rev 19)
+++ trunk/src/moc_locationlistmanager.cpp 2007-05-21 10:18:51 UTC (rev 20)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'locationlistmanager.h'
**
-** Created: Sat May 19 22:58:06 2007
+** Created: Mon May 21 22:01:17 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_locationtablemodel.cpp
===================================================================
--- trunk/src/moc_locationtablemodel.cpp 2007-05-19 11:22:55 UTC (rev 19)
+++ trunk/src/moc_locationtablemodel.cpp 2007-05-21 10:18:51 UTC (rev 20)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'locationtablemodel.h'
**
-** Created: Sat May 19 22:57:53 2007
+** Created: Mon May 21 22:00:43 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_userprofilemanager.cpp
===================================================================
--- trunk/src/moc_userprofilemanager.cpp 2007-05-19 11:22:55 UTC (rev 19)
+++ trunk/src/moc_userprofilemanager.cpp 2007-05-21 10:18:51 UTC (rev 20)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'userprofilemanager.h'
**
-** Created: Sat May 19 22:58:11 2007
+** Created: Mon May 21 22:01:33 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/ui_divedashboardwidget.h
===================================================================
--- trunk/src/ui_divedashboardwidget.h 2007-05-19 11:22:55 UTC (rev 19)
+++ trunk/src/ui_divedashboardwidget.h 2007-05-21 10:18:51 UTC (rev 20)
@@ -1,7 +1,7 @@
/********************************************************************************
** Form generated from reading ui file 'divedashboardwidget.ui'
**
-** Created: Sat May 19 22:52:59 2007
+** Created: Mon May 21 21:51:37 2007
** by: Qt User Interface Compiler version 4.2.1
**
** WARNING! All changes made in this file will be lost when recompiling ui file!
@@ -165,8 +165,8 @@
QPushButton *saveActivityButton;
QPushButton *editRecordButton;
QPushButton *deleteRecordButton;
+ QPushButton *cancelActivityButton;
QPushButton *newRecordButton;
- QPushButton *cancelActivityButton;
void setupUi(QWidget *DiveDashboard)
{
@@ -848,13 +848,13 @@
deleteRecordButton = new QPushButton(contextButtonGroup);
deleteRecordButton->setObjectName(QString::fromUtf8("deleteRecordButton"));
deleteRecordButton->setGeometry(QRect(190, 0, 41, 25));
- newRecordButton = new QPushButton(contextButtonGroup);
- newRecordButton->setObjectName(QString::fromUtf8("newRecordButton"));
- newRecordButton->setGeometry(QRect(150, 0, 41, 25));
cancelActivityButton = new QPushButton(contextButtonGroup);
cancelActivityButton->setObjectName(QString::fromUtf8("cancelActivityButton"));
cancelActivityButton->setGeometry(QRect(30, 0, 31, 25));
cancelActivityButton->setIcon(QIcon(QString::fromUtf8("../pics/x.png")));
+ newRecordButton = new QPushButton(contextButtonGroup);
+ newRecordButton->setObjectName(QString::fromUtf8("newRecordButton"));
+ newRecordButton->setGeometry(QRect(150, 0, 41, 25));
vboxLayout4->addWidget(contextButtonGroup);
@@ -961,8 +961,8 @@
DiveDashboard->resize(size);
- contextTabHolder->setCurrentIndex(3);
- activityTabHolder->setCurrentIndex(6);
+ contextTabHolder->setCurrentIndex(0);
+ activityTabHolder->setCurrentIndex(0);
QMetaObject::connectSlotsByName(DiveDashboard);
@@ -1138,8 +1138,8 @@
saveActivityButton->setText(QString());
editRecordButton->setText(QApplication::translate("DiveDashboard", "Edit", 0, QApplication::UnicodeUTF8));
deleteRecordButton->setText(QApplication::translate("DiveDashboard", "Delete", 0, QApplication::UnicodeUTF8));
+ cancelActivityButton->setText(QString());
newRecordButton->setText(QApplication::translate("DiveDashboard", "New", 0, QApplication::UnicodeUTF8));
- cancelActivityButton->setText(QString());
Q_UNUSED(DiveDashboard);
} // retranslateUi
Modified: trunk/src/userprofilemanager.cpp
===================================================================
--- trunk/src/userprofilemanager.cpp 2007-05-19 11:22:55 UTC (rev 19)
+++ trunk/src/userprofilemanager.cpp 2007-05-21 10:18:51 UTC (rev 20)
@@ -72,6 +72,8 @@
this->m_yourProfile.clear();
this->m_yourProfile.loadFromFile(this->m_userProfileFilename);
this->populateUiFieldsFromObject();
+
+ this->postLoad();
}
void UserProfileManager::save()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dec...@us...> - 2007-05-12 08:27:08
|
Revision: 17
http://frogface.svn.sourceforge.net/frogface/?rev=17&view=rev
Author: declanmcgrath
Date: 2007-05-12 01:27:06 -0700 (Sat, 12 May 2007)
Log Message:
-----------
Applied the code part of Ganesh Sriram's patch which will give Regex's to the
depth values on the dive brief.
Modified Paths:
--------------
trunk/src/divedashboard.cpp
trunk/src/moc_abstractsequentialtablemodel.cpp
trunk/src/moc_buddylistmanager.cpp
trunk/src/moc_buddytablemodel.cpp
trunk/src/moc_divedashboard.cpp
trunk/src/moc_divelistmanager.cpp
trunk/src/moc_divesitetablemodel.cpp
trunk/src/moc_divetablemodel.cpp
trunk/src/moc_froggiemainwindow.cpp
trunk/src/moc_locationlistmanager.cpp
trunk/src/moc_locationtablemodel.cpp
trunk/src/moc_userprofilemanager.cpp
trunk/src/ui_divedashboardwidget.h
Modified: trunk/src/divedashboard.cpp
===================================================================
--- trunk/src/divedashboard.cpp 2007-05-06 04:52:14 UTC (rev 16)
+++ trunk/src/divedashboard.cpp 2007-05-12 08:27:06 UTC (rev 17)
@@ -356,12 +356,14 @@
// QObject::connect(this->maxDepthDiveBriefEdit, SIGNAL(editingFinished()),
// this->diveListManager, SLOT(validateDepth()));
- QRegExp depthRegex;
- depthRegex.setPattern("[0-9]*");
+ QRegExp MaxdepthRegex;
+ MaxdepthRegex.setPattern("[0-9]\\d{0,2}\\.\\d");
+ QValidator *Maxdepthvalidator = new QRegExpValidator(MaxdepthRegex, this->maxDepthDiveBriefEdit);
+ this->maxDepthDiveBriefEdit->setValidator(Maxdepthvalidator);
+ QRegExp AvgdepthRegex;
+ AvgdepthRegex.setPattern("[0-9]\\d{0,2}\\.\\d");
+ QValidator *Avdepthvalidator = new QRegExpValidator(AvgdepthRegex, this->avDepthDiveBriefEdit);
+ this->avDepthDiveBriefEdit->setValidator(Avdepthvalidator);
- QValidator *validator = new QRegExpValidator(depthRegex, this->maxDepthDiveBriefEdit);
- this->maxDepthDiveBriefEdit->setValidator(validator);
-
-
}
Modified: trunk/src/moc_abstractsequentialtablemodel.cpp
===================================================================
--- trunk/src/moc_abstractsequentialtablemodel.cpp 2007-05-06 04:52:14 UTC (rev 16)
+++ trunk/src/moc_abstractsequentialtablemodel.cpp 2007-05-12 08:27:06 UTC (rev 17)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'abstractsequentialtablemodel.h'
**
-** Created: Sun May 6 16:31:40 2007
+** Created: Sat May 12 20:24:08 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_buddylistmanager.cpp
===================================================================
--- trunk/src/moc_buddylistmanager.cpp 2007-05-06 04:52:14 UTC (rev 16)
+++ trunk/src/moc_buddylistmanager.cpp 2007-05-12 08:27:06 UTC (rev 17)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'buddylistmanager.h'
**
-** Created: Sun May 6 16:32:26 2007
+** Created: Sat May 12 20:25:09 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_buddytablemodel.cpp
===================================================================
--- trunk/src/moc_buddytablemodel.cpp 2007-05-06 04:52:14 UTC (rev 16)
+++ trunk/src/moc_buddytablemodel.cpp 2007-05-12 08:27:06 UTC (rev 17)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'buddytablemodel.h'
**
-** Created: Sun May 6 16:32:20 2007
+** Created: Sat May 12 20:25:02 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_divedashboard.cpp
===================================================================
--- trunk/src/moc_divedashboard.cpp 2007-05-06 04:52:14 UTC (rev 16)
+++ trunk/src/moc_divedashboard.cpp 2007-05-12 08:27:06 UTC (rev 17)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divedashboard.h'
**
-** Created: Sun May 6 16:31:10 2007
+** Created: Sat May 12 20:23:37 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_divelistmanager.cpp
===================================================================
--- trunk/src/moc_divelistmanager.cpp 2007-05-06 04:52:14 UTC (rev 16)
+++ trunk/src/moc_divelistmanager.cpp 2007-05-12 08:27:06 UTC (rev 17)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divelistmanager.h'
**
-** Created: Sun May 6 16:31:44 2007
+** Created: Sat May 12 20:24:14 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_divesitetablemodel.cpp
===================================================================
--- trunk/src/moc_divesitetablemodel.cpp 2007-05-06 04:52:14 UTC (rev 16)
+++ trunk/src/moc_divesitetablemodel.cpp 2007-05-12 08:27:06 UTC (rev 17)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divesitetablemodel.h'
**
-** Created: Sun May 6 16:31:29 2007
+** Created: Sat May 12 20:23:54 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_divetablemodel.cpp
===================================================================
--- trunk/src/moc_divetablemodel.cpp 2007-05-06 04:52:14 UTC (rev 16)
+++ trunk/src/moc_divetablemodel.cpp 2007-05-12 08:27:06 UTC (rev 17)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divetablemodel.h'
**
-** Created: Sun May 6 16:31:05 2007
+** Created: Sat May 12 20:23:29 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_froggiemainwindow.cpp
===================================================================
--- trunk/src/moc_froggiemainwindow.cpp 2007-05-06 04:52:14 UTC (rev 16)
+++ trunk/src/moc_froggiemainwindow.cpp 2007-05-12 08:27:06 UTC (rev 17)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'froggiemainwindow.h'
**
-** Created: Sun May 6 16:32:08 2007
+** Created: Sat May 12 20:24:47 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_locationlistmanager.cpp
===================================================================
--- trunk/src/moc_locationlistmanager.cpp 2007-05-06 04:52:14 UTC (rev 16)
+++ trunk/src/moc_locationlistmanager.cpp 2007-05-12 08:27:06 UTC (rev 17)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'locationlistmanager.h'
**
-** Created: Sun May 6 16:31:53 2007
+** Created: Sat May 12 20:24:26 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_locationtablemodel.cpp
===================================================================
--- trunk/src/moc_locationtablemodel.cpp 2007-05-06 04:52:14 UTC (rev 16)
+++ trunk/src/moc_locationtablemodel.cpp 2007-05-12 08:27:06 UTC (rev 17)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'locationtablemodel.h'
**
-** Created: Sun May 6 16:31:35 2007
+** Created: Sat May 12 20:24:01 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_userprofilemanager.cpp
===================================================================
--- trunk/src/moc_userprofilemanager.cpp 2007-05-06 04:52:14 UTC (rev 16)
+++ trunk/src/moc_userprofilemanager.cpp 2007-05-12 08:27:06 UTC (rev 17)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'userprofilemanager.h'
**
-** Created: Sun May 6 16:32:01 2007
+** Created: Sat May 12 20:24:37 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/ui_divedashboardwidget.h
===================================================================
--- trunk/src/ui_divedashboardwidget.h 2007-05-06 04:52:14 UTC (rev 16)
+++ trunk/src/ui_divedashboardwidget.h 2007-05-12 08:27:06 UTC (rev 17)
@@ -1,7 +1,7 @@
/********************************************************************************
** Form generated from reading ui file 'divedashboardwidget.ui'
**
-** Created: Sun May 6 16:26:43 2007
+** Created: Sat May 12 20:16:17 2007
** by: Qt User Interface Compiler version 4.2.1
**
** WARNING! All changes made in this file will be lost when recompiling ui file!
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dec...@us...> - 2007-05-06 04:52:15
|
Revision: 16
http://frogface.svn.sourceforge.net/frogface/?rev=16&view=rev
Author: declanmcgrath
Date: 2007-05-05 21:52:14 -0700 (Sat, 05 May 2007)
Log Message:
-----------
Patch supplied by Ganesh Srirams which subclasses QMainWindow adds menus
to Frogface. Very nice!
Bugs Closed:
1667047 "Cannot return to dive tab after leaving it"
has disappeared. This could be as a result of this patch or a recent
commit.
Bugs Being Worked:
1667040 Add field validation
1667006 Get all dropdowns saving
Modified Paths:
--------------
trunk/src/Makefile
trunk/src/main.cpp
trunk/src/moc_abstractsequentialtablemodel.cpp
trunk/src/moc_buddylistmanager.cpp
trunk/src/moc_buddytablemodel.cpp
trunk/src/moc_divedashboard.cpp
trunk/src/moc_divelistmanager.cpp
trunk/src/moc_divesitetablemodel.cpp
trunk/src/moc_divetablemodel.cpp
trunk/src/moc_locationlistmanager.cpp
trunk/src/moc_locationtablemodel.cpp
trunk/src/moc_userprofilemanager.cpp
trunk/src/src.pro
trunk/src/ui_divedashboardwidget.h
Added Paths:
-----------
trunk/src/froggiemainwindow.cpp
trunk/src/froggiemainwindow.h
trunk/src/moc_froggiemainwindow.cpp
Modified: trunk/src/Makefile
===================================================================
--- trunk/src/Makefile 2007-05-05 12:50:45 UTC (rev 15)
+++ trunk/src/Makefile 2007-05-06 04:52:14 UTC (rev 16)
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: ../bin/frogface
-# Generated by qmake (2.01a) (Qt 4.2.1) on: Sat Apr 14 22:04:22 2007
+# Generated by qmake (2.01a) (Qt 4.2.1) on: Sun May 6 14:49:05 2007
# Project: src.pro
# Template: app
# Command: /usr/bin/qmake -unix -o Makefile src.pro
@@ -67,6 +67,7 @@
divesitetablemodel.cpp \
locationtablemodel.cpp \
sequencenumbermanager.cpp \
+ froggiemainwindow.cpp \
config.cpp \
abstractserialisable.cpp \
abstractsequentialitem.cpp \
@@ -96,6 +97,7 @@
moc_divelistmanager.cpp \
moc_locationlistmanager.cpp \
moc_userprofilemanager.cpp \
+ moc_froggiemainwindow.cpp \
moc_buddytablemodel.cpp \
moc_buddylistmanager.cpp
OBJECTS = divedashboard.o \
@@ -120,6 +122,7 @@
divesitetablemodel.o \
locationtablemodel.o \
sequencenumbermanager.o \
+ froggiemainwindow.o \
config.o \
abstractserialisable.o \
abstractsequentialitem.o \
@@ -150,6 +153,7 @@
moc_divelistmanager.o \
moc_locationlistmanager.o \
moc_userprofilemanager.o \
+ moc_froggiemainwindow.o \
moc_buddytablemodel.o \
moc_buddylistmanager.o
DIST = /usr/share/qt4/mkspecs/common/unix.conf \
@@ -245,7 +249,7 @@
dist:
@$(CHK_DIR_EXISTS) .tmp/frogface1.0.0 || $(MKDIR) .tmp/frogface1.0.0
- $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/frogface1.0.0/ && $(COPY_FILE) --parents dive.h vdecimal.h vdecimallite.h config.h diveprofile.h xmlserialiser.h projecthelper.h location.h locationlist.h divesite.h divesitelist.h divetablemodel.h userprofile.h divelist.h divedashboard.h ui_divedashboardwidget.h countrylist.h country.h countrytablemodel.h divesitetablemodel.h locationtablemodel.h sequencenumbermanager.h abstractserialisable.h abstractsequentialitem.h abstractsequentiallist.h abstractsequentialtablemodel.h tablehelper.h enums.h vtimehelper.h abstractrecord.h crudpanelmanager.h divelistmanager.h locationlistmanager.h abstractrecordlistmanager.h abstractrecordsetmanager.h userprofilemanager.h abstractrecordlist.h qstringhelper.h convenience.h buddy.h buddylist.h buddytablemodel.h buddylistmanager.h profilebase.h .tmp/frogface1.0.0/ && $(COPY_FILE) --parents divedashboard.cpp dive.cpp vdecimal.cpp vdecimallite.cpp diveprofile.cpp xmlserialiser.cpp projecthelper.cpp location.cpp locationlist.cpp divesite.cpp divesitelist.cpp divetablemodel.cpp userprofile.cpp divelist.cpp main.cpp testermain.cpp countrylist.cpp country.cpp countrytablemodel.cpp divesitetablemodel.cpp locationtablemodel.cpp sequencenumbermanager.cpp config.cpp abstractserialisable.cpp abstractsequentialitem.cpp abstractsequentiallist.cpp abstractsequentialtablemodel.cpp tablehelper.cpp vtimehelper.cpp abstractrecord.cpp crudpanelmanager.cpp divelistmanager.cpp locationlistmanager.cpp abstractrecordlistmanager.cpp abstractrecordsetmanager.cpp userprofilemanager.cpp abstractrecordlist.cpp qstringhelper.cpp convenience.cpp buddy.cpp buddylist.cpp buddytablemodel.cpp buddylistmanager.cpp profilebase.cpp .tmp/frogface1.0.0/ && $(COPY_FILE) --parents divedashboardwidget.ui .tmp/frogface1.0.0/ && (cd `dirname .tmp/frogface1.0.0` && $(TAR) frogface1.0.0.tar frogface1.0.0 && $(COMPRESS) frogface1.0.0.tar) && $(MOVE) `dirname .tmp/frogface1.0.0`/frogface1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/frogface1.0.0
+ $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/frogface1.0.0/ && $(COPY_FILE) --parents dive.h vdecimal.h vdecimallite.h config.h diveprofile.h xmlserialiser.h projecthelper.h location.h locationlist.h divesite.h divesitelist.h divetablemodel.h userprofile.h divelist.h divedashboard.h ui_divedashboardwidget.h countrylist.h country.h countrytablemodel.h divesitetablemodel.h locationtablemodel.h sequencenumbermanager.h abstractserialisable.h abstractsequentialitem.h abstractsequentiallist.h abstractsequentialtablemodel.h tablehelper.h enums.h vtimehelper.h abstractrecord.h crudpanelmanager.h divelistmanager.h locationlistmanager.h abstractrecordlistmanager.h abstractrecordsetmanager.h userprofilemanager.h abstractrecordlist.h qstringhelper.h froggiemainwindow.h convenience.h buddy.h buddylist.h buddytablemodel.h buddylistmanager.h profilebase.h .tmp/frogface1.0.0/ && $(COPY_FILE) --parents divedashboard.cpp dive.cpp vdecimal.cpp vdecimallite.cpp diveprofile.cpp xmlserialiser.cpp projecthelper.cpp location.cpp locationlist.cpp divesite.cpp divesitelist.cpp divetablemodel.cpp userprofile.cpp divelist.cpp main.cpp testermain.cpp countrylist.cpp country.cpp countrytablemodel.cpp divesitetablemodel.cpp locationtablemodel.cpp sequencenumbermanager.cpp froggiemainwindow.cpp config.cpp abstractserialisable.cpp abstractsequentialitem.cpp abstractsequentiallist.cpp abstractsequentialtablemodel.cpp tablehelper.cpp vtimehelper.cpp abstractrecord.cpp crudpanelmanager.cpp divelistmanager.cpp locationlistmanager.cpp abstractrecordlistmanager.cpp abstractrecordsetmanager.cpp userprofilemanager.cpp abstractrecordlist.cpp qstringhelper.cpp convenience.cpp buddy.cpp buddylist.cpp buddytablemodel.cpp buddylistmanager.cpp profilebase.cpp .tmp/frogface1.0.0/ && $(COPY_FILE) --parents divedashboardwidget.ui .tmp/frogface1.0.0/ && (cd `dirname .tmp/frogface1.0.0` && $(TAR) frogface1.0.0.tar frogface1.0.0 && $(COMPRESS) frogface1.0.0.tar) && $(MOVE) `dirname .tmp/frogface1.0.0`/frogface1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/frogface1.0.0
yaccclean:
@@ -269,9 +273,9 @@
mocables: compiler_moc_header_make_all compiler_moc_source_make_all
-compiler_moc_header_make_all: moc_divetablemodel.cpp moc_divedashboard.cpp moc_divesitetablemodel.cpp moc_locationtablemodel.cpp moc_abstractsequentialtablemodel.cpp moc_divelistmanager.cpp moc_locationlistmanager.cpp moc_userprofilemanager.cpp moc_buddytablemodel.cpp moc_buddylistmanager.cpp
+compiler_moc_header_make_all: moc_divetablemodel.cpp moc_divedashboard.cpp moc_divesitetablemodel.cpp moc_locationtablemodel.cpp moc_abstractsequentialtablemodel.cpp moc_divelistmanager.cpp moc_locationlistmanager.cpp moc_userprofilemanager.cpp moc_froggiemainwindow.cpp moc_buddytablemodel.cpp moc_buddylistmanager.cpp
compiler_moc_header_clean:
- -$(DEL_FILE) moc_divetablemodel.cpp moc_divedashboard.cpp moc_divesitetablemodel.cpp moc_locationtablemodel.cpp moc_abstractsequentialtablemodel.cpp moc_divelistmanager.cpp moc_locationlistmanager.cpp moc_userprofilemanager.cpp moc_buddytablemodel.cpp moc_buddylistmanager.cpp
+ -$(DEL_FILE) moc_divetablemodel.cpp moc_divedashboard.cpp moc_divesitetablemodel.cpp moc_locationtablemodel.cpp moc_abstractsequentialtablemodel.cpp moc_divelistmanager.cpp moc_locationlistmanager.cpp moc_userprofilemanager.cpp moc_froggiemainwindow.cpp moc_buddytablemodel.cpp moc_buddylistmanager.cpp
moc_divetablemodel.cpp: locationlist.h \
location.h \
divesitelist.h \
@@ -303,9 +307,10 @@
crudpanelmanager.h \
abstractrecordsetmanager.h \
userprofile.h \
+ profilebase.h \
+ xmlserialiser.h \
abstractrecord.h \
abstractserialisable.h \
- xmlserialiser.h \
divelistmanager.h \
dive.h \
diveprofile.h \
@@ -327,8 +332,12 @@
countrylist.h \
country.h \
locationtablemodel.h \
+ buddytablemodel.h \
+ buddylist.h \
+ buddy.h \
tablehelper.h \
abstractrecordlistmanager.h \
+ buddylistmanager.h \
locationlistmanager.h \
divedashboard.h \
/usr/bin/moc
@@ -397,6 +406,11 @@
countrylist.h \
country.h \
locationtablemodel.h \
+ buddytablemodel.h \
+ buddylist.h \
+ buddy.h \
+ userprofile.h \
+ profilebase.h \
tablehelper.h \
abstractrecordlistmanager.h \
crudpanelmanager.h \
@@ -441,19 +455,25 @@
crudpanelmanager.h \
abstractrecordsetmanager.h \
userprofile.h \
+ profilebase.h \
+ xmlserialiser.h \
abstractrecord.h \
abstractserialisable.h \
- xmlserialiser.h \
userprofilemanager.h \
/usr/bin/moc
/usr/bin/moc $(DEFINES) $(INCPATH) userprofilemanager.h -o moc_userprofilemanager.cpp
+moc_froggiemainwindow.cpp: froggiemainwindow.h \
+ /usr/bin/moc
+ /usr/bin/moc $(DEFINES) $(INCPATH) froggiemainwindow.h -o moc_froggiemainwindow.cpp
+
moc_buddytablemodel.cpp: buddylist.h \
buddy.h \
abstractsequentialitem.h \
abstractrecord.h \
abstractserialisable.h \
userprofile.h \
+ profilebase.h \
xmlserialiser.h \
sequencenumbermanager.h \
projecthelper.h \
@@ -470,6 +490,7 @@
abstractrecord.h \
abstractserialisable.h \
userprofile.h \
+ profilebase.h \
xmlserialiser.h \
sequencenumbermanager.h \
projecthelper.h \
@@ -514,9 +535,10 @@
crudpanelmanager.h \
abstractrecordsetmanager.h \
userprofile.h \
+ profilebase.h \
+ xmlserialiser.h \
abstractrecord.h \
abstractserialisable.h \
- xmlserialiser.h \
divelistmanager.h \
dive.h \
diveprofile.h \
@@ -538,8 +560,12 @@
countrylist.h \
country.h \
locationtablemodel.h \
+ buddytablemodel.h \
+ buddylist.h \
+ buddy.h \
tablehelper.h \
abstractrecordlistmanager.h \
+ buddylistmanager.h \
locationlistmanager.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o divedashboard.o divedashboard.cpp
@@ -648,9 +674,10 @@
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o divetablemodel.o divetablemodel.cpp
userprofile.o: userprofile.cpp userprofile.h \
+ profilebase.h \
+ xmlserialiser.h \
abstractrecord.h \
- abstractserialisable.h \
- xmlserialiser.h
+ abstractserialisable.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o userprofile.o userprofile.cpp
divelist.o: divelist.cpp divelist.h \
@@ -669,27 +696,28 @@
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o divelist.o divelist.cpp
main.o: main.cpp config.h \
- divedashboard.h \
- ui_divedashboardwidget.h \
- projecthelper.h \
- userprofilemanager.h \
- enums.h \
- crudpanelmanager.h \
- abstractrecordsetmanager.h \
userprofile.h \
+ profilebase.h \
+ xmlserialiser.h \
abstractrecord.h \
abstractserialisable.h \
- xmlserialiser.h \
- divelistmanager.h \
+ divelist.h \
dive.h \
diveprofile.h \
qstringhelper.h \
vdecimallite.h \
sequencenumbermanager.h \
+ projecthelper.h \
abstractsequentialitem.h \
- divelist.h \
abstractsequentiallist.h \
abstractrecordlist.h \
+ divedashboard.h \
+ ui_divedashboardwidget.h \
+ userprofilemanager.h \
+ enums.h \
+ crudpanelmanager.h \
+ abstractrecordsetmanager.h \
+ divelistmanager.h \
divetablemodel.h \
locationlist.h \
location.h \
@@ -701,9 +729,14 @@
countrylist.h \
country.h \
locationtablemodel.h \
+ buddytablemodel.h \
+ buddylist.h \
+ buddy.h \
tablehelper.h \
abstractrecordlistmanager.h \
- locationlistmanager.h
+ buddylistmanager.h \
+ locationlistmanager.h \
+ froggiemainwindow.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
testermain.o: testermain.cpp
@@ -779,6 +812,9 @@
xmlserialiser.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o sequencenumbermanager.o sequencenumbermanager.cpp
+froggiemainwindow.o: froggiemainwindow.cpp froggiemainwindow.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o froggiemainwindow.o froggiemainwindow.cpp
+
config.o: config.cpp config.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o config.o config.cpp
@@ -846,6 +882,11 @@
countrylist.h \
country.h \
locationtablemodel.h \
+ buddytablemodel.h \
+ buddylist.h \
+ buddy.h \
+ userprofile.h \
+ profilebase.h \
tablehelper.h \
abstractrecordlistmanager.h \
crudpanelmanager.h \
@@ -907,9 +948,10 @@
crudpanelmanager.h \
abstractrecordsetmanager.h \
userprofile.h \
+ profilebase.h \
+ xmlserialiser.h \
abstractrecord.h \
- abstractserialisable.h \
- xmlserialiser.h
+ abstractserialisable.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o userprofilemanager.o userprofilemanager.cpp
abstractrecordlist.o: abstractrecordlist.cpp abstractrecordlist.h \
@@ -927,6 +969,7 @@
abstractrecord.h \
abstractserialisable.h \
userprofile.h \
+ profilebase.h \
xmlserialiser.h \
sequencenumbermanager.h \
projecthelper.h
@@ -938,6 +981,7 @@
abstractrecord.h \
abstractserialisable.h \
userprofile.h \
+ profilebase.h \
xmlserialiser.h \
sequencenumbermanager.h \
projecthelper.h \
@@ -952,6 +996,7 @@
abstractrecord.h \
abstractserialisable.h \
userprofile.h \
+ profilebase.h \
xmlserialiser.h \
sequencenumbermanager.h \
projecthelper.h \
@@ -967,6 +1012,7 @@
abstractrecord.h \
abstractserialisable.h \
userprofile.h \
+ profilebase.h \
xmlserialiser.h \
sequencenumbermanager.h \
projecthelper.h \
@@ -983,7 +1029,8 @@
abstractrecordsetmanager.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o buddylistmanager.o buddylistmanager.cpp
-profilebase.o: profilebase.cpp
+profilebase.o: profilebase.cpp profilebase.h \
+ xmlserialiser.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o profilebase.o profilebase.cpp
moc_divetablemodel.o: moc_divetablemodel.cpp
@@ -1010,6 +1057,9 @@
moc_userprofilemanager.o: moc_userprofilemanager.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_userprofilemanager.o moc_userprofilemanager.cpp
+moc_froggiemainwindow.o: moc_froggiemainwindow.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_froggiemainwindow.o moc_froggiemainwindow.cpp
+
moc_buddytablemodel.o: moc_buddytablemodel.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_buddytablemodel.o moc_buddytablemodel.cpp
@@ -1020,7 +1070,7 @@
install_sources: first FORCE
@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/lib/qt4/demos/sqlbrowser/ || $(MKDIR) $(INSTALL_ROOT)/usr/lib/qt4/demos/sqlbrowser/
- -$(INSTALL_FILE) /mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/src.pro $(INSTALL_ROOT)/usr/lib/qt4/demos/sqlbrowser/
+ -$(INSTALL_FILE) /mnt/extra/NotBackedUp/Projects/Integration/frogface/trunk/src/src.pro $(INSTALL_ROOT)/usr/lib/qt4/demos/sqlbrowser/
uninstall_sources: FORCE
@@ -1029,12 +1079,12 @@
install_target: first FORCE
- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/home/gatto//bin/ || $(MKDIR) $(INSTALL_ROOT)/home/gatto//bin/
- -$(INSTALL_PROGRAM) "../bin/$(QMAKE_TARGET)" "$(INSTALL_ROOT)/home/gatto/bin/$(QMAKE_TARGET)"
+ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/mnt/extra/NotBackedUp/Projects/Integration/frogface/trunk/src/./bin/ || $(MKDIR) $(INSTALL_ROOT)/mnt/extra/NotBackedUp/Projects/Integration/frogface/trunk/src/./bin/
+ -$(INSTALL_PROGRAM) "../bin/$(QMAKE_TARGET)" "$(INSTALL_ROOT)/mnt/extra/NotBackedUp/Projects/Integration/frogface/trunk/src/bin/$(QMAKE_TARGET)"
uninstall_target: FORCE
- -$(DEL_FILE) "$(INSTALL_ROOT)/home/gatto/bin/$(QMAKE_TARGET)"
- -$(DEL_DIR) $(INSTALL_ROOT)/home/gatto//bin/
+ -$(DEL_FILE) "$(INSTALL_ROOT)/mnt/extra/NotBackedUp/Projects/Integration/frogface/trunk/src/bin/$(QMAKE_TARGET)"
+ -$(DEL_DIR) $(INSTALL_ROOT)/mnt/extra/NotBackedUp/Projects/Integration/frogface/trunk/src/./bin/
install: install_sources install_target FORCE
Added: trunk/src/froggiemainwindow.cpp
===================================================================
--- trunk/src/froggiemainwindow.cpp (rev 0)
+++ trunk/src/froggiemainwindow.cpp 2007-05-06 04:52:14 UTC (rev 16)
@@ -0,0 +1,81 @@
+/***************************************************************************
+ * Copyright (C) 2007 by Declan McGrath and Veronica Kelly *
+ * dec...@fr... *
+ * *
+ * Copyright (C) 2007 by Ganesh Srirams *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * *
+ * This program is open source. For license terms, see the LICENSE *
+ * and COPYING files *.
+ ***************************************************************************/
+
+#include "froggiemainwindow.h"
+
+FroggieMainWindow::FroggieMainWindow()
+{
+ createActions();
+ createMenus();
+}
+
+
+void FroggieMainWindow::manual()
+{
+ QMessageBox::about(this, tr("Frogface User Manual"),
+ tr("Link to Frogface Manual"
+ " <a href='http://www.frogface.org/wiki/pmwiki.php?n=Main.UserGuide'>User Manual</a>"));
+}
+
+void FroggieMainWindow::website()
+{
+ QMessageBox::about(this, tr("The Frogface.org website in all it's glory!"),
+ tr("Frogface website: <a href='www.frogface.org'>www.frogface.org</a>"));
+}
+
+void FroggieMainWindow::about()
+{
+ QMessageBox::about(this, tr("About Frogface"),
+ tr("<b>Frogface</b> is an open source scuba dive log with a mission to bring you"
+ "a fast, fun and featureful dive log to capture your undersea adventures!"
+ "It is licenced under the GNU Public Licence (GPL) Version 2, 1991."
+ "If it happens in the sea, log in in <b>Frogface</b>!"));
+}
+
+void FroggieMainWindow::createActions()
+{
+ exitAct = new QAction(tr("&Quit"), this);
+ connect(exitAct, SIGNAL(triggered()), this, SLOT(close()));
+
+ manualAct = new QAction(tr("&Frogface Manual"), this);
+ connect(manualAct, SIGNAL(triggered()), this, SLOT(manual()));
+
+ websiteAct = new QAction(tr("&Our Website"), this);
+ connect(websiteAct, SIGNAL(triggered()), this, SLOT(website()));
+
+ aboutAct = new QAction(tr("&About Frogface"), this);
+ connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));
+}
+
+void FroggieMainWindow::createMenus()
+{
+ fileMenu = menuBar()->addMenu(tr("&File"));
+ fileMenu->addAction(exitAct);
+ helpMenu = menuBar()->addMenu(tr("&Help"));
+ helpMenu->addAction(manualAct);
+ helpMenu->addAction(websiteAct);
+ helpMenu->addSeparator();
+ helpMenu->addAction(aboutAct);
+}
Added: trunk/src/froggiemainwindow.h
===================================================================
--- trunk/src/froggiemainwindow.h (rev 0)
+++ trunk/src/froggiemainwindow.h 2007-05-06 04:52:14 UTC (rev 16)
@@ -0,0 +1,61 @@
+/***************************************************************************
+ * Copyright (C) 2007 by Declan McGrath and Veronica Kelly *
+ * dec...@fr... *
+ * *
+ * Copyright (C) 2007 by Ganesh Srirams *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * *
+ * This program is open source. For license terms, see the LICENSE *
+ * and COPYING files *.
+ ***************************************************************************/
+#ifndef FROGGIEMAINWINDOW_H
+#define FROGGIEMAINWINDOW_H
+
+#include <QMainWindow>
+#include <QtGui>
+
+class QAction;
+class QActionGroup;
+class QLabel;
+class QMenu;
+
+class FroggieMainWindow : public QMainWindow
+{
+ Q_OBJECT
+
+public:
+ FroggieMainWindow();
+
+private slots:
+
+ void about();
+ void manual();
+ void website();
+
+private:
+ void createActions();
+ void createMenus();
+ QMenu *fileMenu;
+ QMenu *helpMenu;
+ QAction *exitAct;
+ QAction *aboutAct;
+ QAction *manualAct;
+ QAction *websiteAct;
+
+};
+
+#endif
Modified: trunk/src/main.cpp
===================================================================
--- trunk/src/main.cpp 2007-05-05 12:50:45 UTC (rev 15)
+++ trunk/src/main.cpp 2007-05-06 04:52:14 UTC (rev 16)
@@ -34,9 +34,8 @@
#include "config.h"
#ifndef TEST_MODE_ONLY
-
+#define TEST_MODE_ONLY
#include <qapplication.h>
-#include <qmainwindow.h>
#include <qmenu.h>
#include <qmenubar.h>
#include <qstatusbar.h>
@@ -45,99 +44,23 @@
#include <QTextStream>
#include <QDomDocument>
#include <QMessageBox>
-//#include <QtXml>
-
-
-//#include "browser.h"
-//#include "userprofile.h"
-//#include "divelist.h"
#include "divedashboard.h"
+#include "froggiemainwindow.h"
int main(int argc, char *argv[])
-{
+{
QApplication app(argc, argv);
- QMainWindow mainWin;
+ FroggieMainWindow mainWin;
mainWin.setWindowTitle(QObject::tr("Frogface Dive Log"));
Gui::DiveDashboard diveDashboard(&mainWin);
mainWin.setCentralWidget(&diveDashboard);
-
- QMenu *menu = mainWin.menuBar()->addMenu(QObject::tr("&File"));
- //menu->addAction(QObject::tr("Add &connection"), &diveDashboard, SLOT(addConnection()));
- //menu->addSeparator();
- //menu->addAction(QObject::tr("&Quit"), &app, SLOT(quit()));
-//
-// UserProfile userProfile;
-// userProfile.firstname = "James";
-// userProfile.surname= "Prendergast";
-// userProfile.nickname= "Jimmy";
-//
-// QMessageBox::information(0, "Application name",
-// Qt::convertFromPlainText(userProfile.serialise()));
-//
-// QString filename = "userprofile.xml";
-// //userProfile.saveToFile(filename);
-// userProfile.loadFromFile(filename);
-
-
-// QFile data("divelog.xml");
-// if (data.open(QFile::WriteOnly | QFile::Truncate))
-// {
-// QTextStream out(&data);
-// out << userProfile.serialise() << endl;
-// //writes "Result: 3.14 2.7 \n"
-//
-// }
-// data.close();
-//
-
-
-// Administrator stuff
-// QMainWindow mainWin;
-// mainWin.setWindowTitle(QObject::tr("Qt SQL Browser"));
-//
-// Administrator administrator(&mainWin);
-// mainWin.setCentralWidget(&administrator);
-//
-// QMenu *menu = mainWin.menuBar()->addMenu(QObject::tr("&File"));
-// menu->addAction(QObject::tr("Add &connection"), &administrator, SLOT(addConnection()));
-// menu->addSeparator();
-// menu->addAction(QObject::tr("&Quit"), &app, SLOT(quit()));
-//
-//
-// QObject::connect(&administrator, SIGNAL(statusMessage(QString)),
-// mainWin.statusBar(), SLOT(showMessage(QString)));
-//
-// mainWin.show();
-//
-// return app.exec();
-
-// QMainWindow mainWin;
-// mainWin.setWindowTitle(QObject::tr("Qt SQL Browser"));
-//
-// Browser browser(&mainWin);
-// mainWin.setCentralWidget(&browser);
-//
-// QMenu *menu = mainWin.menuBar()->addMenu(QObject::tr("&File"));
-// menu->addAction(QObject::tr("Add &connection"), &browser, SLOT(addConnection()));
-// menu->addSeparator();
-// menu->addAction(QObject::tr("&Quit"), &app, SLOT(quit()));
-//
-// QObject::connect(&browser, SIGNAL(statusMessage(QString)),
-// mainWin.statusBar(), SLOT(showMessage(QString)));
-
- //QString jackson = "0123456789";
- //jackson.reverse();
- //QMessageBox::information(0, "info", jackson);
- //DiveList testDiveList;
- //testDiveList.serialise();
- //const QString filename = "diveList.xml";
- //testDiveList.saveToFile(filename);
mainWin.resize(644, 545);
mainWin.show();
return app.exec();
}
+
#endif
Modified: trunk/src/moc_abstractsequentialtablemodel.cpp
===================================================================
--- trunk/src/moc_abstractsequentialtablemodel.cpp 2007-05-05 12:50:45 UTC (rev 15)
+++ trunk/src/moc_abstractsequentialtablemodel.cpp 2007-05-06 04:52:14 UTC (rev 16)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'abstractsequentialtablemodel.h'
**
-** Created: Sat May 5 23:48:54 2007
+** Created: Sun May 6 16:31:40 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_buddylistmanager.cpp
===================================================================
--- trunk/src/moc_buddylistmanager.cpp 2007-05-05 12:50:45 UTC (rev 15)
+++ trunk/src/moc_buddylistmanager.cpp 2007-05-06 04:52:14 UTC (rev 16)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'buddylistmanager.h'
**
-** Created: Sat May 5 23:49:22 2007
+** Created: Sun May 6 16:32:26 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_buddytablemodel.cpp
===================================================================
--- trunk/src/moc_buddytablemodel.cpp 2007-05-05 12:50:45 UTC (rev 15)
+++ trunk/src/moc_buddytablemodel.cpp 2007-05-06 04:52:14 UTC (rev 16)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'buddytablemodel.h'
**
-** Created: Sat May 5 23:49:17 2007
+** Created: Sun May 6 16:32:20 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_divedashboard.cpp
===================================================================
--- trunk/src/moc_divedashboard.cpp 2007-05-05 12:50:45 UTC (rev 15)
+++ trunk/src/moc_divedashboard.cpp 2007-05-06 04:52:14 UTC (rev 16)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divedashboard.h'
**
-** Created: Sat May 5 23:48:37 2007
+** Created: Sun May 6 16:31:10 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_divelistmanager.cpp
===================================================================
--- trunk/src/moc_divelistmanager.cpp 2007-05-05 12:50:45 UTC (rev 15)
+++ trunk/src/moc_divelistmanager.cpp 2007-05-06 04:52:14 UTC (rev 16)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divelistmanager.h'
**
-** Created: Sat May 5 23:48:58 2007
+** Created: Sun May 6 16:31:44 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_divesitetablemodel.cpp
===================================================================
--- trunk/src/moc_divesitetablemodel.cpp 2007-05-05 12:50:45 UTC (rev 15)
+++ trunk/src/moc_divesitetablemodel.cpp 2007-05-06 04:52:14 UTC (rev 16)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divesitetablemodel.h'
**
-** Created: Sat May 5 23:48:46 2007
+** Created: Sun May 6 16:31:29 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_divetablemodel.cpp
===================================================================
--- trunk/src/moc_divetablemodel.cpp 2007-05-05 12:50:45 UTC (rev 15)
+++ trunk/src/moc_divetablemodel.cpp 2007-05-06 04:52:14 UTC (rev 16)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divetablemodel.h'
**
-** Created: Sat May 5 23:48:32 2007
+** Created: Sun May 6 16:31:05 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Added: trunk/src/moc_froggiemainwindow.cpp
===================================================================
--- trunk/src/moc_froggiemainwindow.cpp (rev 0)
+++ trunk/src/moc_froggiemainwindow.cpp 2007-05-06 04:52:14 UTC (rev 16)
@@ -0,0 +1,73 @@
+/****************************************************************************
+** Meta object code from reading C++ file 'froggiemainwindow.h'
+**
+** Created: Sun May 6 16:32:08 2007
+** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#include "froggiemainwindow.h"
+#if !defined(Q_MOC_OUTPUT_REVISION)
+#error "The header file 'froggiemainwindow.h' doesn't include <QObject>."
+#elif Q_MOC_OUTPUT_REVISION != 59
+#error "This file was generated using the moc from 4.2.1. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+static const uint qt_meta_data_FroggieMainWindow[] = {
+
+ // content:
+ 1, // revision
+ 0, // classname
+ 0, 0, // classinfo
+ 3, 10, // methods
+ 0, 0, // properties
+ 0, 0, // enums/sets
+
+ // slots: signature, parameters, type, tag, flags
+ 19, 18, 18, 18, 0x08,
+ 27, 18, 18, 18, 0x08,
+ 36, 18, 18, 18, 0x08,
+
+ 0 // eod
+};
+
+static const char qt_meta_stringdata_FroggieMainWindow[] = {
+ "FroggieMainWindow\0\0about()\0manual()\0website()\0"
+};
+
+const QMetaObject FroggieMainWindow::staticMetaObject = {
+ { &QMainWindow::staticMetaObject, qt_meta_stringdata_FroggieMainWindow,
+ qt_meta_data_FroggieMainWindow, 0 }
+};
+
+const QMetaObject *FroggieMainWindow::metaObject() const
+{
+ return &staticMetaObject;
+}
+
+void *FroggieMainWindow::qt_metacast(const char *_clname)
+{
+ if (!_clname) return 0;
+ if (!strcmp(_clname, qt_meta_stringdata_FroggieMainWindow))
+ return static_cast<void*>(const_cast<FroggieMainWindow*>(this));
+ return QMainWindow::qt_metacast(_clname);
+}
+
+int FroggieMainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+ _id = QMainWindow::qt_metacall(_c, _id, _a);
+ if (_id < 0)
+ return _id;
+ if (_c == QMetaObject::InvokeMetaMethod) {
+ switch (_id) {
+ case 0: about(); break;
+ case 1: manual(); break;
+ case 2: website(); break;
+ }
+ _id -= 3;
+ }
+ return _id;
+}
Modified: trunk/src/moc_locationlistmanager.cpp
===================================================================
--- trunk/src/moc_locationlistmanager.cpp 2007-05-05 12:50:45 UTC (rev 15)
+++ trunk/src/moc_locationlistmanager.cpp 2007-05-06 04:52:14 UTC (rev 16)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'locationlistmanager.h'
**
-** Created: Sat May 5 23:49:05 2007
+** Created: Sun May 6 16:31:53 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_locationtablemodel.cpp
===================================================================
--- trunk/src/moc_locationtablemodel.cpp 2007-05-05 12:50:45 UTC (rev 15)
+++ trunk/src/moc_locationtablemodel.cpp 2007-05-06 04:52:14 UTC (rev 16)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'locationtablemodel.h'
**
-** Created: Sat May 5 23:48:50 2007
+** Created: Sun May 6 16:31:35 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_userprofilemanager.cpp
===================================================================
--- trunk/src/moc_userprofilemanager.cpp 2007-05-05 12:50:45 UTC (rev 15)
+++ trunk/src/moc_userprofilemanager.cpp 2007-05-06 04:52:14 UTC (rev 16)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'userprofilemanager.h'
**
-** Created: Sat May 5 23:49:12 2007
+** Created: Sun May 6 16:32:01 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/src.pro
===================================================================
--- trunk/src/src.pro 2007-05-05 12:50:45 UTC (rev 15)
+++ trunk/src/src.pro 2007-05-06 04:52:14 UTC (rev 16)
@@ -5,7 +5,7 @@
INSTALLS += sources \
target
-target.path = ~/bin
+target.path = ./bin
sources.files += $$SOURCES \
$$HEADERS \
$$FORMS \
@@ -50,6 +50,7 @@
userprofilemanager.h \
abstractrecordlist.h \
qstringhelper.h \
+ froggiemainwindow.h \
convenience.h \
buddy.h \
buddylist.h \
@@ -78,6 +79,7 @@
divesitetablemodel.cpp \
locationtablemodel.cpp \
sequencenumbermanager.cpp \
+ froggiemainwindow.cpp \
config.cpp \
abstractserialisable.cpp \
abstractsequentialitem.cpp \
Modified: trunk/src/ui_divedashboardwidget.h
===================================================================
--- trunk/src/ui_divedashboardwidget.h 2007-05-05 12:50:45 UTC (rev 15)
+++ trunk/src/ui_divedashboardwidget.h 2007-05-06 04:52:14 UTC (rev 16)
@@ -1,7 +1,7 @@
/********************************************************************************
** Form generated from reading ui file 'divedashboardwidget.ui'
**
-** Created: Sat May 5 23:45:24 2007
+** Created: Sun May 6 16:26:43 2007
** by: Qt User Interface Compiler version 4.2.1
**
** WARNING! All changes made in this file will be lost when recompiling ui file!
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dec...@us...> - 2007-05-05 12:50:50
|
Revision: 15
http://frogface.svn.sourceforge.net/frogface/?rev=15&view=rev
Author: declanmcgrath
Date: 2007-05-05 05:50:45 -0700 (Sat, 05 May 2007)
Log Message:
-----------
Updated GUI with some colours and stylesheets. Also started to look at
validators and input masks. The dive profile stuff doesn't seem to save
correctly.
Modified Paths:
--------------
trunk/bin/data/buddylist.xml
trunk/bin/data/debug_info/newDive_DEBUG_INNER.xml
trunk/bin/data/debug_info/newDive_DEBUG_OUTER.xml
trunk/bin/data/divelist.xml
trunk/bin/data/sequencenumbers.xml
trunk/bin/frogface
trunk/frogface.kdevelop.pcs
trunk/frogface.kdevses
trunk/src/divedashboard.cpp
trunk/src/divedashboardwidget.ui
trunk/src/divelistmanager.cpp
trunk/src/divelistmanager.h
trunk/src/moc_abstractsequentialtablemodel.cpp
trunk/src/moc_buddylistmanager.cpp
trunk/src/moc_buddytablemodel.cpp
trunk/src/moc_divedashboard.cpp
trunk/src/moc_divelistmanager.cpp
trunk/src/moc_divesitetablemodel.cpp
trunk/src/moc_divetablemodel.cpp
trunk/src/moc_locationlistmanager.cpp
trunk/src/moc_locationtablemodel.cpp
trunk/src/moc_userprofilemanager.cpp
trunk/src/ui_divedashboardwidget.h
Modified: trunk/bin/data/buddylist.xml
===================================================================
--- trunk/bin/data/buddylist.xml 2007-04-29 08:11:16 UTC (rev 14)
+++ trunk/bin/data/buddylist.xml 2007-05-05 12:50:45 UTC (rev 15)
@@ -13,7 +13,7 @@
<picturefilename></picturefilename>
</buddy>
<buddy>
- <sequenceid>3</sequenceid>
+ <sequenceid>2</sequenceid>
<firstname>Kaffer</firstname>
<surname>mewo</surname>
<nickname>kako</nickname>
@@ -25,7 +25,7 @@
<picturefilename></picturefilename>
</buddy>
<buddy>
- <sequenceid>1</sequenceid>
+ <sequenceid>3</sequenceid>
<firstname>Declan</firstname>
<surname>McGrath</surname>
<nickname>Deco</nickname>
@@ -36,4 +36,16 @@
<phonenumber>345345</phonenumber>
<picturefilename></picturefilename>
</buddy>
+ <buddy>
+ <sequenceid>1</sequenceid>
+ <firstname>Ronnie</firstname>
+ <surname>Ron</surname>
+ <nickname>Veedles</nickname>
+ <divingstyle>Edgy</divingstyle>
+ <certification></certification>
+ <bestdive></bestdive>
+ <email></email>
+ <phonenumber></phonenumber>
+ <picturefilename></picturefilename>
+ </buddy>
</buddylist>
Modified: trunk/bin/data/debug_info/newDive_DEBUG_INNER.xml
===================================================================
--- trunk/bin/data/debug_info/newDive_DEBUG_INNER.xml 2007-04-29 08:11:16 UTC (rev 14)
+++ trunk/bin/data/debug_info/newDive_DEBUG_INNER.xml 2007-05-05 12:50:45 UTC (rev 15)
@@ -1,22 +1,22 @@
<!DOCTYPE none>
<dive>
- <sequenceid>87</sequenceid>
- <divenumber>1</divenumber>
- <date>Thu Apr 19 2007</date>
- <countrysequenceid>7</countrysequenceid>
- <country>France</country>
- <regionsequenceid>128</regionsequenceid>
- <region>Le Boose</region>
- <divesitesequenceid>422</divesitesequenceid>
- <divesite>My house</divesite>
- <diveshop>fasdf</diveshop>
+ <sequenceid>90</sequenceid>
+ <divenumber>4</divenumber>
+ <date>Sun May 6 2007</date>
+ <countrysequenceid>3</countrysequenceid>
+ <country>Australia</country>
+ <regionsequenceid>127</regionsequenceid>
+ <region>Exmouth</region>
+ <divesitesequenceid>420</divesitesequenceid>
+ <divesite>The bends</divesite>
+ <diveshop>grr</diveshop>
<diveprofile>
<timein></timein>
<timeout>00:00:00</timeout>
- <surfaceinterval>20:16:49</surfaceinterval>
+ <surfaceinterval>00:45:46</surfaceinterval>
<divetime>0</divetime>
- <maxdepth>0.0</maxdepth>
- <averagedepth>0.0</averagedepth>
+ <maxdepth>22.0</maxdepth>
+ <averagedepth>1.1</averagedepth>
</diveprofile>
<minimumvisibility>0</minimumvisibility>
<maximumvisibility>0</maximumvisibility>
Modified: trunk/bin/data/debug_info/newDive_DEBUG_OUTER.xml
===================================================================
--- trunk/bin/data/debug_info/newDive_DEBUG_OUTER.xml 2007-04-29 08:11:16 UTC (rev 14)
+++ trunk/bin/data/debug_info/newDive_DEBUG_OUTER.xml 2007-05-05 12:50:45 UTC (rev 15)
@@ -1,22 +1,22 @@
<!DOCTYPE none>
<dive>
- <sequenceid>87</sequenceid>
- <divenumber>1</divenumber>
- <date>Thu Apr 19 2007</date>
- <countrysequenceid>7</countrysequenceid>
- <country>France</country>
- <regionsequenceid>0</regionsequenceid>
- <region>Please select a location...</region>
- <divesitesequenceid>0</divesitesequenceid>
- <divesite>Please select a dive site...</divesite>
- <diveshop>fasdf</diveshop>
+ <sequenceid>90</sequenceid>
+ <divenumber>4</divenumber>
+ <date>Sun May 6 2007</date>
+ <countrysequenceid>3</countrysequenceid>
+ <country>Australia</country>
+ <regionsequenceid>127</regionsequenceid>
+ <region>Exmouth</region>
+ <divesitesequenceid>420</divesitesequenceid>
+ <divesite>The bends</divesite>
+ <diveshop>grr</diveshop>
<diveprofile>
<timein></timein>
<timeout>00:00:00</timeout>
- <surfaceinterval>01:40:06</surfaceinterval>
+ <surfaceinterval>00:45:46</surfaceinterval>
<divetime>0</divetime>
- <maxdepth>0.0</maxdepth>
- <averagedepth>0.0</averagedepth>
+ <maxdepth>22.0</maxdepth>
+ <averagedepth>1.1</averagedepth>
</diveprofile>
<minimumvisibility>0</minimumvisibility>
<maximumvisibility>0</maximumvisibility>
Modified: trunk/bin/data/divelist.xml
===================================================================
--- trunk/bin/data/divelist.xml 2007-04-29 08:11:16 UTC (rev 14)
+++ trunk/bin/data/divelist.xml 2007-05-05 12:50:45 UTC (rev 15)
@@ -14,18 +14,102 @@
<diveprofile>
<timein></timein>
<timeout>00:00:00</timeout>
- <surfaceinterval>20:16:49</surfaceinterval>
+ <surfaceinterval>00:45:46</surfaceinterval>
<divetime>0</divetime>
- <maxdepth>0.0</maxdepth>
- <averagedepth>0.0</averagedepth>
+ <maxdepth>9.7</maxdepth>
+ <averagedepth>9.9</averagedepth>
</diveprofile>
<minimumvisibility>0</minimumvisibility>
<maximumvisibility>0</maximumvisibility>
<temperature>0</temperature>
<current>None</current>
<overalldiverating>0</overalldiverating>
+ <buddysequenceid>1</buddysequenceid>
+ <divemaster></divemaster>
+ <comments></comments>
+ </dive>
+ <dive>
+ <sequenceid>88</sequenceid>
+ <divenumber>2</divenumber>
+ <date>Sat May 5 2007</date>
+ <countrysequenceid>3</countrysequenceid>
+ <country>Australia</country>
+ <regionsequenceid>127</regionsequenceid>
+ <region>Exmouth</region>
+ <divesitesequenceid>420</divesitesequenceid>
+ <divesite>The bends</divesite>
+ <diveshop>adfadfas</diveshop>
+ <diveprofile>
+ <timein></timein>
+ <timeout>00:00:00</timeout>
+ <surfaceinterval>00:45:46</surfaceinterval>
+ <divetime>0</divetime>
+ <maxdepth>8.8</maxdepth>
+ <averagedepth>9.8</averagedepth>
+ </diveprofile>
+ <minimumvisibility>0</minimumvisibility>
+ <maximumvisibility>0</maximumvisibility>
+ <temperature>0</temperature>
+ <current>None</current>
+ <overalldiverating>0</overalldiverating>
<buddysequenceid>0</buddysequenceid>
<divemaster></divemaster>
<comments></comments>
</dive>
+ <dive>
+ <sequenceid>89</sequenceid>
+ <divenumber>3</divenumber>
+ <date>Sat May 5 2007</date>
+ <countrysequenceid>0</countrysequenceid>
+ <country>Please select a country...</country>
+ <regionsequenceid>0</regionsequenceid>
+ <region>Please select a location...</region>
+ <divesitesequenceid>0</divesitesequenceid>
+ <divesite>Please select a dive site...</divesite>
+ <diveshop></diveshop>
+ <diveprofile>
+ <timein></timein>
+ <timeout>00:00:00</timeout>
+ <surfaceinterval>00:45:46</surfaceinterval>
+ <divetime>0</divetime>
+ <maxdepth>3.4</maxdepth>
+ <averagedepth>223.2</averagedepth>
+ </diveprofile>
+ <minimumvisibility>0</minimumvisibility>
+ <maximumvisibility>0</maximumvisibility>
+ <temperature>0</temperature>
+ <current>None</current>
+ <overalldiverating>0</overalldiverating>
+ <buddysequenceid>0</buddysequenceid>
+ <divemaster></divemaster>
+ <comments></comments>
+ </dive>
+ <dive>
+ <sequenceid>90</sequenceid>
+ <divenumber>4</divenumber>
+ <date>Sun May 6 2007</date>
+ <countrysequenceid>3</countrysequenceid>
+ <country>Australia</country>
+ <regionsequenceid>127</regionsequenceid>
+ <region>Exmouth</region>
+ <divesitesequenceid>420</divesitesequenceid>
+ <divesite>The bends</divesite>
+ <diveshop>grr</diveshop>
+ <diveprofile>
+ <timein></timein>
+ <timeout>00:00:00</timeout>
+ <surfaceinterval>00:45:46</surfaceinterval>
+ <divetime>0</divetime>
+ <maxdepth>22.0</maxdepth>
+ <averagedepth>1.1</averagedepth>
+ </diveprofile>
+ <minimumvisibility>0</minimumvisibility>
+ <maximumvisibility>0</maximumvisibility>
+ <temperature>0</temperature>
+ <current>None</current>
+ <overalldiverating>0</overalldiverating>
+ <buddysequenceid>0</buddysequenceid>
+ <divemaster></divemaster>
+ <comments></comments>
+ </dive>
</divelist>
Modified: trunk/bin/data/sequencenumbers.xml
===================================================================
--- trunk/bin/data/sequencenumbers.xml 2007-04-29 08:11:16 UTC (rev 14)
+++ trunk/bin/data/sequencenumbers.xml 2007-05-05 12:50:45 UTC (rev 15)
@@ -1,6 +1,6 @@
<!DOCTYPE none>
<sequencenumbermanager>
- <divesequencenumber>87</divesequencenumber>
+ <divesequencenumber>90</divesequencenumber>
<regionsequencenumber>128</regionsequencenumber>
<divesitesequencenumber>423</divesitesequencenumber>
<countrysequencenumber>2</countrysequencenumber>
Modified: trunk/bin/frogface
===================================================================
(Binary files differ)
Modified: trunk/frogface.kdevelop.pcs
===================================================================
(Binary files differ)
Modified: trunk/frogface.kdevses
===================================================================
--- trunk/frogface.kdevses 2007-04-29 08:11:16 UTC (rev 14)
+++ trunk/frogface.kdevses 2007-05-05 12:50:45 UTC (rev 15)
@@ -1,49 +1,73 @@
<?xml version = '1.0' encoding = 'UTF-8'?>
<!DOCTYPE KDevPrjSession>
<KDevPrjSession>
- <DocsAndViews NumberOfDocuments="14" >
- <Doc0 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/divelistmanager.h" >
+ <DocsAndViews NumberOfDocuments="22" >
+ <Doc0 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/main.cpp" >
<View0 Type="Source" />
</Doc0>
- <Doc1 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/xmlserialiser.h" >
+ <Doc1 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/abstractrecord.h" >
<View0 Type="Source" />
</Doc1>
- <Doc2 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/divelistmanager.cpp" >
- <View0 line="705" Type="Source" />
+ <Doc2 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/abstractrecord.cpp" >
+ <View0 Type="Source" />
</Doc2>
- <Doc3 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/divedashboard.h" >
- <View0 line="63" Type="Source" />
+ <Doc3 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/abstractrecordlist.h" >
+ <View0 Type="Source" />
</Doc3>
- <Doc4 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/divedashboard.cpp" >
- <View0 line="80" Type="Source" />
+ <Doc4 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/abstractserialisable.h" >
+ <View0 Type="Source" />
</Doc4>
- <Doc5 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/countrytablemodel.h" >
- <View0 line="38" Type="Source" />
+ <Doc5 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/abstractserialisable.cpp" >
+ <View0 Type="Source" />
</Doc5>
- <Doc6 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/countrytablemodel.cpp" >
- <View0 line="75" Type="Source" />
+ <Doc6 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/sequencenumbermanager.h" >
+ <View0 Type="Source" />
</Doc6>
- <Doc7 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/locationtablemodel.h" >
+ <Doc7 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/sequencenumbermanager.cpp" >
<View0 Type="Source" />
</Doc7>
- <Doc8 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/locationtablemodel.cpp" >
- <View0 line="149" Type="Source" />
+ <Doc8 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/ui_divedashboardwidget.h" >
+ <View0 Type="Source" />
</Doc8>
- <Doc9 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/buddytablemodel.h" >
+ <Doc9 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/divedashboard.h" >
<View0 Type="Source" />
</Doc9>
- <Doc10 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/abstractsequentialtablemodel.h" >
- <View0 line="48" Type="Source" />
+ <Doc10 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/divelistmanager.h" >
+ <View0 Type="Source" />
</Doc10>
- <Doc11 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/divetablemodel.h" >
- <View0 line="41" Type="Source" />
+ <Doc11 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/divelistmanager.cpp" >
+ <View0 Type="Source" />
</Doc11>
- <Doc12 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/divesitetablemodel.h" >
- <View0 line="36" Type="Source" />
+ <Doc12 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/buddytablemodel.h" >
+ <View0 Type="Source" />
</Doc12>
- <Doc13 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/divesitetablemodel.cpp" >
- <View0 line="180" Type="Source" />
+ <Doc13 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/buddytablemodel.cpp" >
+ <View0 Type="Source" />
</Doc13>
+ <Doc14 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/divesitetablemodel.h" >
+ <View0 Type="Source" />
+ </Doc14>
+ <Doc15 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/divesitetablemodel.cpp" >
+ <View0 Type="Source" />
+ </Doc15>
+ <Doc16 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/countrytablemodel.h" >
+ <View0 Type="Source" />
+ </Doc16>
+ <Doc17 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/countrytablemodel.cpp" >
+ <View0 Type="Source" />
+ </Doc17>
+ <Doc18 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/locationtablemodel.h" >
+ <View0 Type="Source" />
+ </Doc18>
+ <Doc19 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/locationtablemodel.cpp" >
+ <View0 Type="Source" />
+ </Doc19>
+ <Doc20 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/dive.h" >
+ <View0 Type="Source" />
+ </Doc20>
+ <Doc21 NumberOfViews="1" URL="file:///mnt/extra/NotBackedUp/Projects/Subverted/frogface/trunk/src/dive.cpp" >
+ <View0 line="378" Type="Source" />
+ </Doc21>
</DocsAndViews>
<pluginList>
<kdevdebugger>
Modified: trunk/src/divedashboard.cpp
===================================================================
--- trunk/src/divedashboard.cpp 2007-04-29 08:11:16 UTC (rev 14)
+++ trunk/src/divedashboard.cpp 2007-05-05 12:50:45 UTC (rev 15)
@@ -353,4 +353,15 @@
QObject::connect(this->regionDiveBriefCombo, SIGNAL(currentIndexChanged(int)),
this->diveListManager, SLOT(regionChanged(int)));
+// QObject::connect(this->maxDepthDiveBriefEdit, SIGNAL(editingFinished()),
+// this->diveListManager, SLOT(validateDepth()));
+
+ QRegExp depthRegex;
+ depthRegex.setPattern("[0-9]*");
+
+
+ QValidator *validator = new QRegExpValidator(depthRegex, this->maxDepthDiveBriefEdit);
+ this->maxDepthDiveBriefEdit->setValidator(validator);
+
+
}
Modified: trunk/src/divedashboardwidget.ui
===================================================================
--- trunk/src/divedashboardwidget.ui 2007-04-29 08:11:16 UTC (rev 14)
+++ trunk/src/divedashboardwidget.ui 2007-05-05 12:50:45 UTC (rev 15)
@@ -32,9 +32,9 @@
<colorrole role="Button" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
- <red>221</red>
- <green>223</green>
- <blue>228</blue>
+ <red>238</red>
+ <green>238</green>
+ <blue>238</blue>
</color>
</brush>
</colorrole>
@@ -50,27 +50,27 @@
<colorrole role="Midlight" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
- <red>255</red>
- <green>255</green>
- <blue>255</blue>
+ <red>246</red>
+ <green>246</green>
+ <blue>246</blue>
</color>
</brush>
</colorrole>
<colorrole role="Dark" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
- <red>85</red>
- <green>85</green>
- <blue>85</blue>
+ <red>119</red>
+ <green>119</green>
+ <blue>119</blue>
</color>
</brush>
</colorrole>
<colorrole role="Mid" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
- <red>199</red>
- <green>199</green>
- <blue>199</blue>
+ <red>159</red>
+ <green>159</green>
+ <blue>159</blue>
</color>
</brush>
</colorrole>
@@ -113,9 +113,9 @@
<colorrole role="Window" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
- <red>239</red>
- <green>239</green>
- <blue>239</blue>
+ <red>177</red>
+ <green>226</green>
+ <blue>81</blue>
</color>
</brush>
</colorrole>
@@ -131,9 +131,9 @@
<colorrole role="Highlight" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
- <red>103</red>
- <green>141</green>
- <blue>178</blue>
+ <red>68</red>
+ <green>123</green>
+ <blue>205</blue>
</color>
</brush>
</colorrole>
@@ -146,24 +146,6 @@
</color>
</brush>
</colorrole>
- <colorrole role="Link" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>0</red>
- <green>0</green>
- <blue>238</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="LinkVisited" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>82</red>
- <green>24</green>
- <blue>139</blue>
- </color>
- </brush>
- </colorrole>
<colorrole role="AlternateBase" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
@@ -187,9 +169,9 @@
<colorrole role="Button" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
- <red>221</red>
- <green>223</green>
- <blue>228</blue>
+ <red>238</red>
+ <green>238</green>
+ <blue>238</blue>
</color>
</brush>
</colorrole>
@@ -205,27 +187,27 @@
<colorrole role="Midlight" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
- <red>255</red>
- <green>255</green>
- <blue>255</blue>
+ <red>246</red>
+ <green>246</green>
+ <blue>246</blue>
</color>
</brush>
</colorrole>
<colorrole role="Dark" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
- <red>85</red>
- <green>85</green>
- <blue>85</blue>
+ <red>119</red>
+ <green>119</green>
+ <blue>119</blue>
</color>
</brush>
</colorrole>
<colorrole role="Mid" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
- <red>199</red>
- <green>199</green>
- <blue>199</blue>
+ <red>159</red>
+ <green>159</green>
+ <blue>159</blue>
</color>
</brush>
</colorrole>
@@ -268,9 +250,9 @@
<colorrole role="Window" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
- <red>239</red>
- <green>239</green>
- <blue>239</blue>
+ <red>177</red>
+ <green>226</green>
+ <blue>81</blue>
</color>
</brush>
</colorrole>
@@ -286,9 +268,9 @@
<colorrole role="Highlight" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
- <red>103</red>
- <green>141</green>
- <blue>178</blue>
+ <red>68</red>
+ <green>123</green>
+ <blue>205</blue>
</color>
</brush>
</colorrole>
@@ -301,24 +283,6 @@
</color>
</brush>
</colorrole>
- <colorrole role="Link" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>0</red>
- <green>0</green>
- <blue>238</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="LinkVisited" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>82</red>
- <green>24</green>
- <blue>139</blue>
- </color>
- </brush>
- </colorrole>
<colorrole role="AlternateBase" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
@@ -342,9 +306,9 @@
<colorrole role="Button" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
- <red>221</red>
- <green>223</green>
- <blue>228</blue>
+ <red>238</red>
+ <green>238</green>
+ <blue>238</blue>
</color>
</brush>
</colorrole>
@@ -360,27 +324,27 @@
<colorrole role="Midlight" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
- <red>255</red>
- <green>255</green>
- <blue>255</blue>
+ <red>246</red>
+ <green>246</green>
+ <blue>246</blue>
</color>
</brush>
</colorrole>
<colorrole role="Dark" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
- <red>85</red>
- <green>85</green>
- <blue>85</blue>
+ <red>119</red>
+ <green>119</green>
+ <blue>119</blue>
</color>
</brush>
</colorrole>
<colorrole role="Mid" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
- <red>199</red>
- <green>199</green>
- <blue>199</blue>
+ <red>159</red>
+ <green>159</green>
+ <blue>159</blue>
</color>
</brush>
</colorrole>
@@ -405,27 +369,27 @@
<colorrole role="ButtonText" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
- <red>128</red>
- <green>128</green>
- <blue>128</blue>
+ <red>119</red>
+ <green>119</green>
+ <blue>119</blue>
</color>
</brush>
</colorrole>
<colorrole role="Base" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
- <red>239</red>
- <green>239</green>
- <blue>239</blue>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
- <red>239</red>
- <green>239</green>
- <blue>239</blue>
+ <red>177</red>
+ <green>226</green>
+ <blue>81</blue>
</color>
</brush>
</colorrole>
@@ -441,9 +405,9 @@
<colorrole role="Highlight" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
- <red>86</red>
- <green>117</green>
- <blue>148</blue>
+ <red>205</red>
+ <green>205</green>
+ <blue>205</blue>
</color>
</brush>
</colorrole>
@@ -456,24 +420,6 @@
</color>
</brush>
</colorrole>
- <colorrole role="Link" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>0</red>
- <green>0</green>
- <blue>238</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="LinkVisited" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>82</red>
- <green>24</green>
- <blue>139</blue>
- </color>
- </brush>
- </colorrole>
<colorrole role="AlternateBase" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
@@ -487,19 +433,48 @@
</palette>
</property>
<property name="font" >
- <font>
- <family>Sans Serif</family>
- <pointsize>7</pointsize>
- <weight>50</weight>
- <italic>false</italic>
- <bold>false</bold>
- <underline>false</underline>
- <strikeout>false</strikeout>
- </font>
+ <font/>
</property>
<property name="windowTitle" >
<string>Frogface</string>
</property>
+ <property name="styleSheet" >
+ <string>QWidget#DiveDashboard {
+background-color: #B1E251; /* Nice green */
+/* background-color:#5AB2E0;*/ /* Sea blue */
+/* THIS WORKS BUT NOT USED background-image:url(/mnt/extra/NotBackedUp/Projects/Subverted/t.jpg);*/
+}
+
+QWidget{
+/*background-color:#ebf7d4;*/ /* Lighter green */
+/*background-color:#D8F0A8;*/ /* Darker green
+ */
+/*background-color: #F4F5C4;*/ /* Magnolia */
+background-color: #F4F5E0; /* Light Magnolia */
+color: black;
+}
+
+QPushButton {
+color: white;
+background-color: silver;
+border-top: 2px solid white;
+border-left: 2px solid white;
+border-bottom: 2px solid black;
+border-right: 2px solid black;
+}
+
+/*
+QFrame {
+background-color: silver;
+}
+*/
+
+QComboBox, QTextEdit,QLineEdit {
+background-color: #B1E251;
+}
+
+</string>
+ </property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
@@ -591,15 +566,7 @@
</rect>
</property>
<property name="font" >
- <font>
- <family>Sans Serif</family>
- <pointsize>30</pointsize>
- <weight>50</weight>
- <italic>false</italic>
- <bold>false</bold>
- <underline>false</underline>
- <strikeout>false</strikeout>
- </font>
+ <font/>
</property>
<property name="acceptDrops" >
<bool>false</bool>
@@ -621,15 +588,7 @@
</rect>
</property>
<property name="font" >
- <font>
- <family>Sans Serif</family>
- <pointsize>30</pointsize>
- <weight>50</weight>
- <italic>false</italic>
- <bold>false</bold>
- <underline>false</underline>
- <strikeout>false</strikeout>
- </font>
+ <font/>
</property>
<property name="acceptDrops" >
<bool>false</bool>
@@ -651,15 +610,7 @@
</rect>
</property>
<property name="font" >
- <font>
- <family>Sans Serif</family>
- <pointsize>30</pointsize>
- <weight>50</weight>
- <italic>false</italic>
- <bold>false</bold>
- <underline>false</underline>
- <strikeout>false</strikeout>
- </font>
+ <font/>
</property>
<property name="acceptDrops" >
<bool>false</bool>
@@ -681,15 +632,7 @@
</rect>
</property>
<property name="font" >
- <font>
- <family>Sans Serif</family>
- <pointsize>30</pointsize>
- <weight>50</weight>
- <italic>false</italic>
- <bold>false</bold>
- <underline>false</underline>
- <strikeout>false</strikeout>
- </font>
+ <font/>
</property>
<property name="acceptDrops" >
<bool>false</bool>
@@ -714,15 +657,7 @@
</rect>
</property>
<property name="font" >
- <font>
- <family>Sans Serif</family>
- <pointsize>30</pointsize>
- <weight>50</weight>
- <italic>false</italic>
- <bold>false</bold>
- <underline>false</underline>
- <strikeout>false</strikeout>
- </font>
+ <font/>
</property>
<property name="acceptDrops" >
<bool>false</bool>
@@ -744,15 +679,7 @@
</rect>
</property>
<property name="font" >
- <font>
- <family>Sans Serif</family>
- <pointsize>30</pointsize>
- <weight>50</weight>
- <italic>false</italic>
- <bold>false</bold>
- <underline>false</underline>
- <strikeout>false</strikeout>
- </font>
+ <font/>
</property>
<property name="acceptDrops" >
<bool>false</bool>
@@ -833,7 +760,7 @@
</size>
</property>
<property name="currentIndex" >
- <number>5</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="diveBriefTabPage" >
<attribute name="title" >
@@ -849,15 +776,7 @@
</rect>
</property>
<property name="font" >
- <font>
- <family>Sans Serif</family>
- <pointsize>45</pointsize>
- <weight>50</weight>
- <italic>false</italic>
- <bold>false</bold>
- <underline>false</underline>
- <strikeout>false</strikeout>
- </font>
+ <font/>
</property>
<property name="smallDecimalPoint" >
<bool>false</bool>
@@ -872,67 +791,6 @@
<double>0.000000000000000</double>
</property>
</widget>
- <widget class="QLabel" name="diveNumberLabel" >
- <property name="geometry" >
- <rect>
- <x>80</x>
- <y>10</y>
- <width>61</width>
- <height>16</height>
- </rect>
- </property>
- <property name="text" >
- <string>Dive Number</string>
- </property>
- <property name="buddy" >
- <cstring>diveNumberLcd</cstring>
- </property>
- </widget>
- <widget class="QLineEdit" name="shopDiveBriefEdit" >
- <property name="geometry" >
- <rect>
- <x>60</x>
- <y>210</y>
- <width>191</width>
- <height>21</height>
- </rect>
- </property>
- </widget>
- <widget class="QLabel" name="diveSiteDiveBriefLabel" >
- <property name="geometry" >
- <rect>
- <x>10</x>
- <y>180</y>
- <width>40</width>
- <height>12</height>
- </rect>
- </property>
- <property name="toolTip" >
- <string>Town or region or island</string>
- </property>
- <property name="text" >
- <string>Dive Site</string>
- </property>
- <property name="buddy" >
- <cstring>diveSiteDiveBriefCombo</cstring>
- </property>
- </widget>
- <widget class="QLabel" name="countryDiveBriefLabel" >
- <property name="geometry" >
- <rect>
- <x>10</x>
- <y>120</y>
- <width>40</width>
- <height>12</height>
- </rect>
- </property>
- <property name="text" >
- <string>Country</string>
- </property>
- <property name="buddy" >
- <cstring>countryDiveBriefCombo</cstring>
- </property>
- </widget>
<widget class="QLabel" name="diveDateLabel" >
<property name="geometry" >
<rect>
@@ -949,86 +807,6 @@
<cstring>diveDateEdit</cstring>
</property>
</widget>
- <widget class="QLabel" name="regionDiveBriefLabel" >
- <property name="geometry" >
- <rect>
- <x>10</x>
- <y>150</y>
- <width>40</width>
- <height>12</height>
- </rect>
- </property>
- <property name="toolTip" >
- <string>Town or region or island</string>
- </property>
- <property name="text" >
- <string>Region</string>
- </property>
- <property name="buddy" >
- <cstring>diveSiteDiveBriefCombo</cstring>
- </property>
- </widget>
- <widget class="QComboBox" name="diveSiteDiveBriefCombo" >
- <property name="geometry" >
- <rect>
- <x>60</x>
- <y>180</y>
- <width>191</width>
- <height>22</height>
- </rect>
- </property>
- <property name="modelColumn" >
- <number>1</number>
- </property>
- </widget>
- <widget class="QLabel" name="shopDiveBriefLabel" >
- <property name="geometry" >
- <rect>
- <x>10</x>
- <y>210</y>
- <width>48</width>
- <height>16</height>
- </rect>
- </property>
- <property name="toolTip" >
- <string>Town or region or island</string>
- </property>
- <property name="text" >
- <string>Dive Centre</string>
- </property>
- <property name="buddy" >
- <cstring>shopDiveBriefEdit</cstring>
- </property>
- </widget>
- <widget class="QComboBox" name="regionDiveBriefCombo" >
- <property name="geometry" >
- <rect>
- <x>60</x>
- <y>150</y>
- <width>191</width>
- <height>22</height>
- </rect>
- </property>
- <property name="editable" >
- <bool>false</bool>
- </property>
- <property name="modelColumn" >
- <number>1</number>
- </property>
- </widget>
- <widget class="QCheckBox" name="noDiveNumberCheckBox" >
- <property name="geometry" >
- <rect>
- <x>163</x>
- <y>60</y>
- <width>91</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text" >
- <string>No Dive Number</string>
- </property>
- </widget>
<widget class="QLabel" name="naLabel" >
<property name="enabled" >
<bool>true</bool>
@@ -1042,15 +820,7 @@
</rect>
</property>
<property name="font" >
- <font>
- <family>Nimbus Mono L</family>
- <pointsize>37</pointsize>
- <weight>50</weight>
- <italic>false</italic>
- <bold>false</bold>
- <underline>false</underline>
- <strikeout>false</strikeout>
- </font>
+ <font/>
</property>
<property name="autoFillBackground" >
<bool>true</bool>
@@ -1078,18 +848,27 @@
<string>dd MMMM yyyy</string>
</property>
</widget>
- <widget class="QComboBox" name="countryDiveBriefCombo" >
+ <widget class="QLabel" name="newDiveLabel" >
<property name="geometry" >
<rect>
- <x>60</x>
- <y>120</y>
- <width>191</width>
- <height>22</height>
+ <x>20</x>
+ <y>30</y>
+ <width>80</width>
+ <height>60</height>
</rect>
</property>
- <property name="modelColumn" >
- <number>1</number>
+ <property name="autoFillBackground" >
+ <bool>false</bool>
</property>
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="pixmap" >
+ <pixmap>../pics/newDive4.png</pixmap>
+ </property>
+ <property name="scaledContents" >
+ <bool>true</bool>
+ </property>
</widget>
<widget class="QGroupBox" name="diveProfileGroup" >
<property name="geometry" >
@@ -1103,43 +882,43 @@
<property name="title" >
<string>Dive Profile</string>
</property>
- <widget class="QLineEdit" name="maxDepthDiveBriefEdit" >
+ <widget class="QLabel" name="label_7" >
<property name="geometry" >
<rect>
- <x>26</x>
- <y>157</y>
- <width>31</width>
- <height>21</height>
+ <x>22</x>
+ <y>30</y>
+ <width>200</width>
+ <height>140</height>
</rect>
</property>
<property name="text" >
- <string>0.0</string>
+ <string/>
</property>
+ <property name="pixmap" >
+ <pixmap>../pics/diveProfileThin.png</pixmap>
+ </property>
</widget>
- <widget class="QLabel" name="maxDepthDiveBriefLabel" >
+ <widget class="QLabel" name="label_3" >
<property name="geometry" >
<rect>
- <x>16</x>
- <y>137</y>
- <width>51</width>
- <height>31</height>
+ <x>160</x>
+ <y>80</y>
+ <width>80</width>
+ <height>60</height>
</rect>
</property>
- <property name="toolTip" >
- <string>Town or region or island</string>
- </property>
<property name="text" >
- <string>Max Depth</string>
+ <string/>
</property>
- <property name="buddy" >
- <cstring>maxDepthDiveBriefEdit</cstring>
+ <property name="pixmap" >
+ <pixmap>../pics/littleShark.png</pixmap>
</property>
</widget>
- <widget class="QLabel" name="diveTimeDiveBriefLabel" >
+ <widget class="QLabel" name="timeInDiveBriefLabel" >
<property name="geometry" >
<rect>
- <x>118</x>
- <y>148</y>
+ <x>30</x>
+ <y>20</y>
<width>40</width>
<height>12</height>
</rect>
@@ -1148,30 +927,17 @@
<string>Town or region or island</string>
</property>
<property name="text" >
- <string>Divetime</string>
+ <string>Time In</string>
</property>
<property name="buddy" >
- <cstring>diveTimeDiveBriefEdit</cstring>
+ <cstring>timeOutDiveBriefLabel</cstring>
</property>
</widget>
- <widget class="QLineEdit" name="avDepthDiveBriefEdit" >
+ <widget class="QLabel" name="maxDepthDiveBriefLabel" >
<property name="geometry" >
<rect>
- <x>32</x>
- <y>96</y>
- <width>31</width>
- <height>21</height>
- </rect>
- </property>
- <property name="text" >
- <string>0.0</string>
- </property>
- </widget>
- <widget class="QLabel" name="avDepthDiveBriefLabel" >
- <property name="geometry" >
- <rect>
- <x>32</x>
- <y>76</y>
+ <x>20</x>
+ <y>139</y>
<width>51</width>
<height>31</height>
</rect>
@@ -1180,30 +946,17 @@
<string>Town or region or island</string>
</property>
<property name="text" >
- <string>Av Depth</string>
+ <string>Max Depth</string>
</property>
<property name="buddy" >
<cstring>maxDepthDiveBriefEdit</cstring>
</property>
</widget>
- <widget class="QLineEdit" name="timeInDiveBriefEdit" >
+ <widget class="QLabel" name="diveTimeDiveBriefLabel" >
<property name="geometry" >
<rect>
- <x>52</x>
- <y>38</y>
- <width>31</width>
- <height>21</height>
- </rect>
- </property>
- <property name="text" >
- <string>00:00</string>
- </property>
- </widget>
- <widget class="QLabel" name="timeInDiveBriefLabel" >
- <property name="geometry" >
- <rect>
- <x>19</x>
- <y>40</y>
+ <x>107</x>
+ <y>147</y>
<width>40</width>
<height>12</height>
</rect>
@@ -1212,17 +965,17 @@
<string>Town or region or island</string>
</property>
<property name="text" >
- <string>Time In</string>
+ <string>Divetime</string>
</property>
<property name="buddy" >
- <cstring>timeOutDiveBriefLabel</cstring>
+ <cstring>diveTimeDiveBriefEdit</cstring>
</property>
</widget>
<widget class="QLabel" name="surfIntDiveBriefLabel" >
<property name="geometry" >
<rect>
- <x>112</x>
- <y>10</y>
+ <x>110</x>
+ <y>7</y>
<width>40</width>
<height>12</height>
</rect>
@@ -1240,8 +993,8 @@
<widget class="QLabel" name="timeOutDiveBriefLabel" >
<property name="geometry" >
<rect>
- <x>162</x>
- <y>40</y>
+ <x>185</x>
+ <y>20</y>
<width>40</width>
<height>12</height>
</rect>
@@ -1256,20 +1009,32 @@
<cstring>timeOutDiveBriefEdit</cstring>
</property>
</widget>
- <widget class="QLineEdit" name="diveTimeDiveBriefEdit" >
+ <widget class="QLineEdit" name="surfIntDiveBriefEdit" >
+ <property name="enabled" >
+ <bool>true</bool>
+ </property>
<property name="geometry" >
<rect>
- <x>118</x>
- <y>158</y>
- <width>31</width>
- <height>21</height>
+ <x>106</x>
+ <y>20</y>
+ <width>41</width>
+ <height>23</height>
</rect>
</property>
<property name="focusPolicy" >
<enum>Qt::StrongFocus</enum>
</property>
+ <property name="layoutDirection" >
+ <enum>Qt::LeftToRight</enum>
+ </property>
+ <property name="autoFillBackground" >
+ <bool>false</bool>
+ </property>
+ <property name="inputMask" >
+ <string>99:99;-</string>
+ </property>
<property name="text" >
- <string>0</string>
+ <string>:</string>
</property>
<property name="readOnly" >
<bool>false</bool>
@@ -1277,106 +1042,276 @@
</widget>
<widget class="QLineEdit" name="timeOutDiveBriefEdit" >
<property name="enabled" >
- <bool>false</bool>
+ <bool>true</bool>
</property>
<property name="geometry" >
<rect>
- <x>202</x>
- <y>38</y>
- <width>31</width>
- <height>21</height>
+ <x>186</x>
+ <y>34</y>
+ <width>41</width>
+ <height>23</height>
</rect>
</property>
+ <property name="layoutDirection" >
+ <enum>Qt::LeftToRight</enum>
+ </property>
<property name="autoFillBackground" >
<bool>false</bool>
</property>
+ <property name="inputMask" >
+ <string>99:99;-</string>
+ </property>
<property name="text" >
- <string>00:00</string>
+ <string>:</string>
</property>
<property name="readOnly" >
<bool>false</bool>
</property>
</widget>
- <widget class="QLineEdit" name="surfIntDiveBriefEdit" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
+ <widget class="QLineEdit" name="timeInDiveBriefEdit" >
<property name="geometry" >
<rect>
- <x>112</x>
- <y>20</y>
- <width>31</width>
- <height>21</height>
+ <x>27</x>
+ <y>34</y>
+ <width>41</width>
+ <height>23</height>
</rect>
</property>
- <property name="focusPolicy" >
- <enum>Qt::NoFocus</enum>
+ <property name="layoutDirection" >
+ <enum>Qt::LeftToRight</enum>
</property>
- <property name="autoFillBackground" >
- <bool>false</bool>
+ <property name="inputMask" >
+ <string>99:99 ;-</string>
</property>
<property name="text" >
- <string>00:00</string>
+ <string>: </string>
</property>
- <property name="readOnly" >
- <bool>false</bool>
+ </widget>
+ <widget class="QLabel" name="avDepthDiveBriefLabel" >
+ <property name="geometry" >
+ <rect>
+ <x>20</x>
+ <y>79</y>
+ <width>51</width>
+ <height>31</height>
+ </rect>
</property>
+ <property name="toolTip" >
+ <string>Town or region or island</string>
+ </property>
+ <property name="text" >
+ <string>Av Depth</string>
+ </property>
+ <property name="buddy" >
+ <cstring>maxDepthDiveBriefEdit</cstring>
+ </property>
</widget>
- <widget class="QLabel" name="label_3" >
+ <widget class="QLineEdit" name="avDepthDiveBriefEdit" >
<property name="geometry" >
<rect>
- <x>160</x>
- <y>80</y>
- <width>80</width>
- <height>60</height>
+ <x>20</x>
+ <y>100</y>
+ <width>41</width>
+ <height>23</height>
</rect>
</property>
<property name="text" >
<string/>
</property>
- <property name="pixmap" >
- <pixmap>../pics/littleShark.png</pixmap>
- </property>
</widget>
- <widget class="QLabel" name="label_7" >
+ <widget class="QLineEdit" name="maxDepthDiveBriefEdit" >
<property name="geometry" >
<rect>
- <x>22</x>
- <y>30</y>
- <width>200</width>
- <height>140</height>
+ <x>20</x>
+ <y>160</y>
+ <width>41</width>
+ <height>23</height>
</rect>
</property>
<property name="text" >
<string/>
</property>
- <property name="pixmap" >
- <pixmap>../pics/diveProfileThin.png</pixmap>
+ </widget>
+ <widget class="QLineEdit" name="diveTimeDiveBriefEdit" >
+ <property name="geometry" >
+ <rect>
+ <x>107</x>
+ <y>160</y>
+ <width>41</width>
+ <height>23</height>
+ </rect>
</property>
+ <property name="focusPolicy" >
+ <enum>Qt::StrongFocus</enum>
+ </property>
+ <property name="layoutDirection" >
+ <enum>Qt::LeftToRight</enum>
+ </property>
+ <property name="inputMask" >
+ <string>99:99;-</string>
+ </property>
+ <property name="text" >
+ <string>:</string>
+ </property>
+ <property name="readOnly" >
+ <bool>false</bool>
+ </property>
</widget>
</widget>
- <widget class="QLabel" name="newDiveLabel" >
+ <widget class="QCheckBox" name="noDiveNumberCheckBox" >
<property name="geometry" >
<rect>
- <x>20</x>
- <y>30</y>
- <width>80</width>
- <height>60</height>
+ <x>154</x>
+ <y>60</y>
+ <width>100</width>
+ <height>20</height>
</rect>
</property>
- <property name="autoFillBackground" >
- <bool>false</bool>
+ <property name="text" >
+ <string>No Dive Number</string>
</property>
+ </widget>
+ <widget class="QLabel" name="diveNumberLabel" >
+ <property name="geometry" >
+ <rect>
+ <x>74</x>
+ <y>10</y>
+ <width>61</width>
+ <height>16</height>
+ </rect>
+ </property>
<property name="text" >
- <string/>
+ <string>Dive Number</string>
</property>
- <property name="pixmap" >
- <pixmap>../pics/newDive4.png</pixmap>
+ <property name="buddy" >
+ <cstring>diveNumberLcd</cstring>
</property>
- <property name="scaledContents" >
- <bool>true</bool>
+ </widget>
+ <widget class="QLabel" name="diveSiteDiveBriefLabel" >
+ <property name="geometry" >
+ <rect>
+ <x>10</x>
+ <y>180</y>
+ <width>45</width>
+ <height>12</height>
+ </rect>
</property>
+ <property name="toolTip" >
+ <string>Town or region or island</string>
+ </property>
+ <property name="text" >
+ <string>Dive Site</string>
+ </property>
+ <property name="buddy" >
+ <cstring>diveSiteDiveBriefCombo</cstring>
+ </property>
</widget>
+ <widget class="QLabel" name="regionDiveBriefLabel" >
+ <property name="geometry" >
+ <rect>
+ <x>10</x>
+ <y>150</y>
+ <width>40</width>
+ <height>12</height>
+ </rect>
+ </property>
+ <property name="toolTip" >
+ <string>Town or region or island</string>
+ </property>
+ <property name="text" >
+ <string>Region</string>
+ </property>
+ <property name="buddy" >
+ <cstring>diveSiteDiveBriefCombo</cstring>
+ </property>
+ </widget>
+ <widget class="QLabel" name="countryDiveBriefLabel" >
+ <property name="geometry" >
+ <rect>
+ <x>10</x>
+ <y>120</y>
+ <width>40</width>
+ <height>12</height>
+ </rect>
+ </property>
+ <property name="text" >
+ <string>Country</string>
+ </property>
+ <property name="buddy" >
+ <cstring>countryDiveBriefCombo</cstring>
+ </property>
+ </widget>
+ <widget class="QLabel" name="shopDiveBriefLabel" >
+ <property name="geometry" >
+ <rect>
+ <x>10</x>
+ <y>210</y>
+ <width>64</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="toolTip" >
+ <string>Town or region or island</string>
+ </property>
+ <property name="text" >
+ <string>Dive Centre</string>
+ </property>
+ <property name="buddy" >
+ <cstring>shopDiveBriefEdit</cstring>
+ </property>
+ </widget>
+ <widget class="QLineEdit" name="shopDiveBriefEdit" >
+ <property name="geometry" >
+ <rect>
+ <x>70</x>
+ <y>210</y>
+ <width>181</width>
+ <height>21</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QComboBox" name="diveSiteDiveBriefCombo" >
+ <property name="geometry" >
+ <rect>
+ <x>70</x>
+ <y>180</y>
+ <width>181</width>
+ <height>22</height>
+ </rect>
+ </property>
+ <property name="modelColumn" >
+ <number>1</number>
+ </property>
+ </widget>
+ <widget class="QComboBox" name="regionDiveBriefCombo" >
+ <property name="geometry" >
+ <rect>
+ <x>70</x>
+ <y>150</y>
+ <width>181</width>
+ <height>22</height>
+ </rect>
+ </property>
+ <property name="editable" >
+ <bool>false</bool>
+ </property>
+ <property name="modelColumn" >
+ <number>1</number>
+ </property>
+ </widget>
+ <widget class="QComboBox" name="countryDiveBriefCombo" >
+ <property name="geometry" >
+ <rect>
+ <x>70</x>
+ <y>120</y>
+ <width>181</width>
+ <height>22</height>
+ </rect>
+ </property>
+ <property name="modelColumn" >
+ <number>1</number>
+ </property>
+ </widget>
</widget>
<widget class="QWidget" name="diveDetailsTabPage" >
<attribute name="title" >
@@ -1433,15 +1368,7 @@
</rect>
</property>
<property name="font" >
- <font>
- <family>URW Chancery L</family>
- <pointsize>19</pointsize>
- <weight>75</weight>
- <italic>false</italic>
- <bold>true</bold>
- <underline>false</underline>
- <strikeout>false</strikeout>
- </font>
+ <font/>
</property>
<property name="text" >
<string>Not Yet Rated</string>
@@ -1688,15 +1615,7 @@
</rect>
</property>
<property name="font" >
- <font>
- <family>Sans Serif</family>
- <pointsize>9</pointsize>
- <weight>75</weight>
- <italic>false</italic>
- <bold>true</bold>
- <underline>false</underline>
- <strikeout>false</strikeout>
- </font>
+ <font/>
</property>
<property name="toolTip" >
<string>Town or region or island</string>
@@ -2504,76 +2423,76 @@
<property name="title" >
<string/>
</property>
- <widget class="QPushButton" name="newRecordButton" >
+ <widget class="QPushButton" name="saveActivityButton" >
<property name="geometry" >
<rect>
- <x>150</x>
+ <x>0</x>
<y>0</y>
- <width>41</width>
+ <width>31</width>
<height>25</height>
</rect>
</property>
<property name="text" >
- <string>New</string>
+ <string/>
</property>
+ <property name="icon" >
+ <iconset>../pics/tick.png</iconset>
+ </property>
</widget>
- <widget class="QPushButton" name="cancelActivityButton" >
+ <widget class="QPushButton" name="editRecordButton" >
<property name="geometry" >
<rect>
- <x>30</x>
+ <x>230</x>
<y>0</y>
- <width>31</width>
+ <width>41</width>
<height>25</height>
</rect>
</property>
<property name="text" >
- <string/>
+ <string>Edit</string>
</property>
- <property name="icon" >
- <iconset>../pics/x.png</iconset>
- </property>
</widget>
- <widget class="QPushButton" name="saveActivityButton" >
+ <widget class="QPushButton" name="deleteRecordButton" >
<property name="geometry" >
<rect>
- <x>0</x>
+ <x>190</x>
<y>0</y>
- <width>31</width>
+ <width>41</width>
<height>25</height>
</rect>
</property>
<property name="text" >
- <string/>
+ <string>Delete</string>
</property>
- <property name="icon" >
- <iconset>../pics/tick.png</iconset>
- </property>
</widget>
- <widget class="QPushButton" name="editRecordButton" >
+ <widget class="QPushButton" name="newRecordButton" >
<property name="geometry" >
<rect>
- <x>230</x>
+ <x>150</x>
<y>0</y>
<width>41</width>
<height>25</height>
</rect>
</property>
<property name="text" >
- <string>Edit</string>
+ <string>New</string>
</property>
</widget>
- <widget class="QPushButton" name="deleteRecordButton" >
+ <widget class="QPushButton" name="cancelActivityButton" >
<property name="geometry" >
<rect>
- <x>190</x>
+ <x>30</x>
<y>0</y>
- <width>41</width>
+ <width>31</width>
<height>25</height>
</rect>
</property>
<property name="text" >
- <string>Delete</string>
+ <string/>
</property>
+ <property name="icon" >
+ <iconset>../pics/x.png</iconset>
+ </property>
</widget>
</widget>
</item>
@@ -2583,6 +2502,62 @@
</item>
</layout>
</widget>
+ <tabstops>
+ <tabstop>maximumVisibilityEdit</tabstop>
+ <tabstop>deleteDiveSiteButton</tabstop>
+ <tabstop>addDiveSiteButton</tabstop>
+ <tabstop>regionLocationDetailsEdit</tabstop>
+ <tabstop>countryLocationDetailsCombo</tabstop>
+ <tabstop>diveSiteTable</tabstop>
+ <tabstop>diveTable</tabstop>
+ <tabstop>surfIntDiveBriefEdit</tabstop>
+ <tabstop>buddyTable</tabstop>
+ <tabstop>contextTabHolder</tabstop>
+ <tabstop>nicknameBuddyEdit</tabstop>
+ <tabstop>divingStyleBuddyCombo</tabstop>
+ <tabstop>emailBuddyEdit</tabstop>
+ <tabstop>phoneBuddyEdit</tabstop>
+ <tabstop>loc...
[truncated message content] |
|
From: <dec...@us...> - 2007-04-29 08:11:17
|
Revision: 14
http://frogface.svn.sourceforge.net/frogface/?rev=14&view=rev
Author: declanmcgrath
Date: 2007-04-29 01:11:16 -0700 (Sun, 29 Apr 2007)
Log Message:
-----------
Bugs Closed:
1670691 Create the buddy list and required classes
1667034 Bind Buddy Dive Combo to a buddy table model
Summary:
Hurrah! This is a great result. Finally all the basic
lists are in place for Frogface, thus bringing down the
curtain on Froggie's first chapter.
Modified Paths:
--------------
trunk/src/buddytablemodel.cpp
trunk/src/dive.h
trunk/src/divelistmanager.cpp
trunk/src/divelistmanager.h
trunk/src/moc_divedashboard.cpp
trunk/src/moc_divelistmanager.cpp
trunk/src/moc_divetablemodel.cpp
Modified: trunk/src/buddytablemodel.cpp
===================================================================
--- trunk/src/buddytablemodel.cpp 2007-04-19 07:17:08 UTC (rev 13)
+++ trunk/src/buddytablemodel.cpp 2007-04-29 08:11:16 UTC (rev 14)
@@ -142,8 +142,14 @@
if (!index.isValid())
return Qt::ItemIsEnabled;
else
- return Qt::ItemIsSelectable;
+ {
+ // HACK: This is a big dirty hack as I am too lazy
+ // to implement the correct permissions
+ return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable | QAbstractItemModel::flags(index);
+
+ //return Qt::ItemIsSelectable|Qt::ItemIsEditable;
//return QAbstractItemModel::flags(index) | Qt::ItemIsEditable;
+ }
}
QVariant BuddyTableModel::headerData(int section, Qt::Orientation orientation,
Modified: trunk/src/dive.h
===================================================================
--- trunk/src/dive.h 2007-04-19 07:17:08 UTC (rev 13)
+++ trunk/src/dive.h 2007-04-29 08:11:16 UTC (rev 14)
@@ -38,6 +38,7 @@
#include "xmlserialiser.h"
#include "sequencenumbermanager.h"
#include "abstractsequentialitem.h"
+#include "projecthelper.h"
namespace Data
{
Modified: trunk/src/divelistmanager.cpp
===================================================================
--- trunk/src/divelistmanager.cpp 2007-04-19 07:17:08 UTC (rev 13)
+++ trunk/src/divelistmanager.cpp 2007-04-29 08:11:16 UTC (rev 14)
@@ -248,9 +248,9 @@
int fieldValue = diveToLoad.overallDiveRating();
m_ui_diveDashboard->overallDial->setValue(fieldValue);
-// // TODO: buddyDiveDetailsCombo
-// itemIndex = diveToLoad.buddySequenceId();
-// m_ui_diveDashboard->buddyDiveDetailsCombo->setCurrentIndex(itemIndex);
+ // buddyDiveDetailsCombo
+ itemIndex = m_ui_diveDashboard->buddyDiveDetailsCombo->findData(diveToLoad.buddySequenceId(), Qt::UserRole);
+ m_ui_diveDashboard->buddyDiveDetailsCombo->setCurrentIndex(itemIndex);
// divemasterEdit
fieldText = diveToLoad.divemaster();
@@ -462,8 +462,11 @@
// overallDiveRating
dive.setOverallDiveRating(m_ui_diveDashboard->overallDial->value());
-// // TODO:buddySequenceId (add new data model or add QVariant to combo items???)
-// dive.setBuddySequenceId(this->buddyDiveDetailsCombo->currentText());
+ // buddySequenceId
+ selectedRowIndex = m_ui_diveDashboard->buddyDiveDetailsCombo->currentIndex();
+ equivalentModelIndex = m_ui_diveDashboard->buddyDiveDetailsCombo->model()->index(selectedRowIndex, 0);
+ int buddySequenceId = (m_ui_diveDashboard->buddyDiveDetailsCombo->model()->data(equivalentModelIndex)).toInt();
+ dive.setBuddySequenceId(buddySequenceId);
// divemaster
dive.setDivemaster(m_ui_diveDashboard->divemasterEdit->text());
@@ -709,6 +712,18 @@
this->m_ui_diveDashboard->diveSiteDiveBriefCombo->setModelColumn(1);
}
+void DiveListManager::loadBuddyDiveDetailsListCombo()
+{
+ // TODO: Create a buddy control and have it carry out its
+ // own populatation
+ Model::BuddyTableModel* model = new Model::BuddyTableModel();
+ model->loadFromFile(Config::BUDDYLIST_FILENAME);
+ this->m_ui_diveDashboard->buddyDiveDetailsCombo->setModel(model);
+ this->m_ui_diveDashboard->buddyDiveDetailsCombo->setModelColumn(1);
+
+ this->m_ui_diveDashboard->buddyDiveDetailsCombo->setCurrentIndex(0);
+}
+
void DiveListManager::regionChanged(int rowIndex)
{
QModelIndex modelIndex = this->m_ui_diveDashboard->regionDiveBriefCombo->model()->index(rowIndex, 0);
@@ -729,11 +744,20 @@
this->loadRegionDiveBriefListCombo(countrySequenceIdAsInt);
}
+// void DiveListManager::buddyChanged(int rowIndex)
+// {
+// QModelIndex modelIndex = this->m_ui_diveDashboard->buddyDiveDetailsCombo->model()->index(rowIndex, 1);
+// QString buddySequenceId = this->m_ui_diveDashboard->buddyDiveDetailsCombo->model()->data(modelIndex).toString();
+// int buddySequenceIdAsInt = QVariant(buddySequenceId).toInt();
+// this->loadBuddyDiveDetailsListCombo(buddySequenceIdAsInt);
+// }
+
/**
* This reloads any combo boxes who data may have
* been changed since initial loading
*/
void DiveListManager::reloadDynamicCombos()
{
+ this->loadBuddyDiveDetailsListCombo();
this->loadCountryDiveBriefListCombo();
}
Modified: trunk/src/divelistmanager.h
===================================================================
--- trunk/src/divelistmanager.h 2007-04-19 07:17:08 UTC (rev 13)
+++ trunk/src/divelistmanager.h 2007-04-29 08:11:16 UTC (rev 14)
@@ -36,6 +36,7 @@
#include "divesitetablemodel.h"
#include "countrytablemodel.h"
#include "locationtablemodel.h"
+#include "buddytablemodel.h"
#include "config.h"
#include "tablehelper.h"
#include "abstractrecordlistmanager.h"
@@ -154,11 +155,13 @@
void loadRegionDiveBriefListCombo(); // NEVER MAKE VIRTUAL
void loadRegionDiveBriefListCombo(int countrySequenceId); // NEVER MAKE VIRTUAL
void loadDiveSiteListCombo(int locationSequenceId); // NEVER MAKE VIRTUAL
+ void loadBuddyDiveDetailsListCombo(); // NEVER MAKE VIRTUAL
void reloadDynamicCombos(); // NEVER MAKE VIRTUAL
public slots:
void regionChanged(int rowIndex);
void countryChanged(int rowIndex);
+ //void buddyChanged(int rowIndex);
};
}
Modified: trunk/src/moc_divedashboard.cpp
===================================================================
--- trunk/src/moc_divedashboard.cpp 2007-04-19 07:17:08 UTC (rev 13)
+++ trunk/src/moc_divedashboard.cpp 2007-04-29 08:11:16 UTC (rev 14)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divedashboard.h'
**
-** Created: Thu Apr 19 19:59:03 2007
+** Created: Sun Apr 29 19:39:28 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_divelistmanager.cpp
===================================================================
--- trunk/src/moc_divelistmanager.cpp 2007-04-19 07:17:08 UTC (rev 13)
+++ trunk/src/moc_divelistmanager.cpp 2007-04-29 08:11:16 UTC (rev 14)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divelistmanager.h'
**
-** Created: Thu Apr 19 19:59:14 2007
+** Created: Sun Apr 29 19:39:43 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/src/moc_divetablemodel.cpp
===================================================================
--- trunk/src/moc_divetablemodel.cpp 2007-04-19 07:17:08 UTC (rev 13)
+++ trunk/src/moc_divetablemodel.cpp 2007-04-29 08:11:16 UTC (rev 14)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'divetablemodel.h'
**
-** Created: Thu Apr 19 02:44:54 2007
+** Created: Sun Apr 29 19:39:20 2007
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
