linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2229
committer: poy <poy@xxxxxxxxxx>
branch nick: repo
timestamp: Thu 2010-09-02 00:17:02 +0200
message:
  fix initial startup issues
modified:
  dcpp/ConnectivityManager.cpp
  dcpp/ConnectivityManager.h
  dcpp/version.h
  win32/DCPlusPlus.rc
  win32/MainWindow.cpp
  win32/NetworkPage.cpp


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'dcpp/ConnectivityManager.cpp'
--- dcpp/ConnectivityManager.cpp	2010-08-30 20:49:35 +0000
+++ dcpp/ConnectivityManager.cpp	2010-09-01 22:17:02 +0000
@@ -30,7 +30,10 @@
 namespace dcpp {
 
 ConnectivityManager::ConnectivityManager() :
-autoDetected(false) { }
+autoDetected(false),
+running(false)
+{
+}
 
 void ConnectivityManager::startSocket() {
 	autoDetected = false;

=== modified file 'dcpp/ConnectivityManager.h'
--- dcpp/ConnectivityManager.h	2010-09-01 15:07:18 +0000
+++ dcpp/ConnectivityManager.h	2010-09-01 22:17:02 +0000
@@ -42,7 +42,7 @@
 public:
 	void detectConnection();
 	void setup(bool settingsChanged, int lastConnectionMode);
-	bool isRunning() { return running; }
+	bool isRunning() const { return running; }
 
 private:
 	friend class Singleton<ConnectivityManager>;

=== modified file 'dcpp/version.h'
--- dcpp/version.h	2010-06-18 12:19:12 +0000
+++ dcpp/version.h	2010-09-01 22:17:02 +0000
@@ -17,8 +17,8 @@
  */
 
 #define APPNAME "DC++"
-#define VERSIONSTRING "0.770"
-#define VERSIONFLOAT 0.770
+#define VERSIONSTRING "0.777"
+#define VERSIONFLOAT 0.777
 
 namespace dcpp {
 extern const string fullVersionString;

=== modified file 'win32/DCPlusPlus.rc'
--- win32/DCPlusPlus.rc	2010-08-29 15:42:38 +0000
+++ win32/DCPlusPlus.rc	2010-09-01 22:17:02 +0000
@@ -98,8 +98,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,7,7,0
- PRODUCTVERSION 0,7,7,0
+ FILEVERSION 0,7,7,7
+ PRODUCTVERSION 0,7,7,7
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -116,12 +116,12 @@
         BEGIN
             VALUE "Comments", "http://dcplusplus.sourceforge.net";
             VALUE "FileDescription", "DC++"
-            VALUE "FileVersion", "0, 7, 7, 0"
+            VALUE "FileVersion", "0, 7, 7, 7"
             VALUE "InternalName", "DC++"
             VALUE "LegalCopyright", "Copyright 2001-2010 Jacek Sieka"
             VALUE "OriginalFilename", "DCPlusPlus.exe"
             VALUE "ProductName", "DC++"
-            VALUE "ProductVersion", "0, 7, 7, 0"
+            VALUE "ProductVersion", "0, 7, 7, 7"
         END
     END
     BLOCK "VarFileInfo"

=== modified file 'win32/MainWindow.cpp'
--- win32/MainWindow.cpp	2010-08-29 16:00:08 +0000
+++ win32/MainWindow.cpp	2010-09-01 22:17:02 +0000
@@ -171,10 +171,23 @@
 		handleMinimized();
 
 	if(SETTING(NICK).empty()) {
-		callAsync(std::bind(&SystemFrame::openWindow, getTabView()));
-
-		WinUtil::help(this, IDH_GET_STARTED);
-		callAsync(std::bind(&MainWindow::handleSettings, this));
+		callAsync([this]() {
+			bool systemLogOpen = false;
+			const dwt::TabView::ChildList& views = tabs->getChildren();
+			for(dwt::TabView::ChildList::const_iterator i = views.begin(); i != views.end(); ++i) {
+				MDIChildFrame<dwt::Container>* child = static_cast<MDIChildFrame<dwt::Container>*>(*i);
+				if(child->getId() == SystemFrame::id) {
+					systemLogOpen = true;
+					break;
+				}
+			}
+
+			if(!systemLogOpen)
+				SystemFrame::openWindow(getTabView());
+
+			WinUtil::help(this, IDH_GET_STARTED);
+			handleSettings();
+		});
 	}
 
 	if(dwt::LibraryLoader::getCommonControlsVersion() < PACK_COMCTL_VERSION(5,80))

=== modified file 'win32/NetworkPage.cpp'
--- win32/NetworkPage.cpp	2010-08-30 20:49:35 +0000
+++ win32/NetworkPage.cpp	2010-09-01 22:17:02 +0000
@@ -61,9 +61,8 @@
 		detectNow->onClicked(std::bind(&NetworkPage::handleDetectClicked, this));
 
 		GroupBoxPtr logGroup = cur->addChild(GroupBox::Seed(T_("Detection log")));
-		
 		log = logGroup->addChild(WinUtil::Seeds::Dialog::richTextBox);
-		log->setHelpId(IDH_SETTINGS_NETWORK_DETECTION_LOG);
+		logGroup->setHelpId(IDH_SETTINGS_NETWORK_DETECTION_LOG);
 	}
 
 	{