Changeset 84

Timestamp:

21/05/07 15:45:18 (6 years ago)

Author:

guyru

Message:

moved LaunchBrowser?() to UtilityFunctions?.h

Location:

trunk/OpenYahtzee

Files:

• openyahtzee.kdevelop.pcs (modified) (previous)
• openyahtzee.kdevses (modified) (3 diffs)
• src/About.h (modified) (1 diff)
• src/MainFrame.cpp (modified) (2 diffs)
• src/MainFrame.h (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/Makefile.in (modified) (1 diff)
• src/UtilityFunctions.h (added)

trunk/OpenYahtzee/openyahtzee.kdevses

@@ -2 +2 @@
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
- <DocsAndViews NumberOfDocuments="8" >
+ <DocsAndViews NumberOfDocuments="10" >
   <Doc0 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/About.cpp" >
-   <View0 Type="Source" />
+   <View0 line="0" Type="Source" />
   </Doc0>
   <Doc1 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/DBwrapper.cpp" >
@@ -13 +13 @@
   </Doc2>
   <Doc3 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/HighScoreDialog.cpp" >
-   <View0 line="113" Type="Source" />
+   <View0 Type="Source" />
   </Doc3>
   <Doc4 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/openyahtzee.cpp" >
@@ -19 +19 @@
   </Doc4>
   <Doc5 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/MainFrame.cpp" >
-   <View0 line="871" Type="Source" />
+   <View0 line="36" Type="Source" />
   </Doc5>
   <Doc6 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/MainFrame.h" >
-   <View0 line="77" Type="Source" />
+   <View0 line="20" Type="Source" />
   </Doc6>
   <Doc7 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/HighScoreDialog.h" >
    <View0 line="33" Type="Source" />
   </Doc7>
+  <Doc8 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/About.h" >
+   <View0 line="66" Type="Source" />
+  </Doc8>
+  <Doc9 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/UtilityFunctions.h" >
+   <View0 line="80" Type="Source" />
+  </Doc9>
  </DocsAndViews>
  <pluginList>

trunk/OpenYahtzee/src/About.h

@@ -67 +67 @@
 
 
+
 #endif // ABOUT_H

trunk/OpenYahtzee/src/MainFrame.cpp

@@ -35 +35 @@
 #include "SettingsDialog.h"
 #include "About.h"
+#include "UtilityFunctions.h"
 #include <iostream>
 #include <sstream>
@@ -946 +947 @@
 }
 
-/**
- * This function launches the default browser and directs it to a given url.
- *
- * This function extends the wxWidgets default function for this job by checking manually for
- * different browsers if the wxWidgets' function doesn't find one. This is usually necessary 
- * under linux when epiphany isn't installed for some unknown reason.
- * @param link The url that the browser will go to when it stats.
- */
-void MainFrame::LaunchBrowser (wxString link){
-        if (!wxLaunchDefaultBrowser(link)){
-                 //if builtin function doesn't work search for couple of browsers manually. see
-                 //http://linux-consulting.buanzo.com.ar/2006/05/wxwidgets-code-to-launch-browser.html
-
-                // variable declarations
-                wxArrayString browsers;
-                wxPathList path_list;
-                bool BrowserWasFound = false;
-                unsigned int i = 0;
-                wxString path;
-
-                // Add directories to wxPathList's search path from PATH environment variable
-                path_list.AddEnvList(wxT("PATH"));
-                
-                // Add browsers filenames. First item = most priority
-                browsers.Add(wxT("firefox"));
-                browsers.Add(wxT("firefox-bin"));
-                browsers.Add(wxT("mozilla"));
-                browsers.Add(wxT("mozilla-bin"));
-                browsers.Add(wxT("opera"));
-                browsers.Add(wxT("konqueror"));
-                browsers.Add(wxT("epiphany"));
-                
-                for (i = 0; i < browsers.GetCount(); i++) {
-                        path = path_list.FindAbsoluteValidPath(browsers[i]);
-                        if (path.IsEmpty()) {
-                                continue;
-                        } else {
-                                BrowserWasFound = true;
-                                break;
-                        }
-                }
-                
-                browsers.Clear();
-                
-                if (BrowserWasFound) {
-                        path += wxT(" ");
-                        path += link;
-                        ::wxExecute(path);
-                } else {
-                        wxMessageBox(wxT("No browser has been found."),wxT("OpenYahtzee"));
-                }
-        }
-}
 
 /**

trunk/OpenYahtzee/src/MainFrame.h

@@ -75 +75 @@
         void PostScore(int id);
         void CalculateSubTotal();
-        void LaunchBrowser (wxString link);
         int InitializeDatabase();
 

trunk/OpenYahtzee/src/Makefile.am

@@ -11 +11 @@
 
 noinst_HEADERS = MainFrame.h ObjectsID.h SettingsDB.h HighScoreTableDB.h \
-        HighScoreDialog.h SettingsDialog.h Icon.h icon32.ico wxDynamicBitmap.h
+        HighScoreDialog.h SettingsDialog.h Icon.h icon32.ico wxDynamicBitmap.h UtilityFunctions.h
 
 openyahtzee_LDFLAGS = `wx-config --libs` -lsqlite3

trunk/OpenYahtzee/src/Makefile.in

@@ -196 +196 @@
 # the library search path.
 noinst_HEADERS = MainFrame.h ObjectsID.h SettingsDB.h HighScoreTableDB.h \
-        HighScoreDialog.h SettingsDialog.h Icon.h icon32.ico wxDynamicBitmap.h
+        HighScoreDialog.h SettingsDialog.h Icon.h icon32.ico wxDynamicBitmap.h UtilityFunctions.h
 
 openyahtzee_LDFLAGS = `wx-config --libs` -lsqlite3