Changeset 7661 in orxonox.OLD for trunk/src/lib/gui/gtk_gui

Timestamp:

May 18, 2006, 12:55:34 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the QT_GUI back to the trunk
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/qt_gui . -r7607:HEAD

absolutely no conflicts

Location:

trunk/src/lib/gui/gtk_gui

Files:

• Makefile.am (modified) (1 diff)
• gui_element.h (modified) (2 diffs)
• gui_exec.cc (modified) (5 diffs)
• gui_update.cc (modified) (1 diff)

trunk/src/lib/gui/gtk_gui/Makefile.am

@@ -2 +2 @@
 include $(MAINSRCDIR)/defs/include_paths.am
 
-noinst_LIBRARIES = libORXgui.a
+noinst_LIBRARIES = libORXgtkgui.a
 
-libORXgui_a_CPPFLAGS = -DBUILD_ORXONOX \
-                        $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
+libORXgtkgui_a_CPPFLAGS = \
+                -DBUILD_ORXONOX \
+                $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
 
-libORXgui_a_SOURCES = gui.cc \
-                      gui_gtk.cc \
-                      gui_element.cc \
-                      gui_video.cc \
-                      gui_audio.cc \
-                      gui_exec.cc \
-                      gui_flags.cc \
-                      gui_banner.cc \
-                      gui_keys.cc \
-                      gui_update.cc
+libORXgtkgui_a_SOURCES = \
+                gui.cc \
+                gui_gtk.cc \
+                gui_element.cc \
+                gui_video.cc \
+                gui_audio.cc \
+                gui_exec.cc \
+                gui_flags.cc \
+                gui_banner.cc \
+                gui_keys.cc \
+                gui_update.cc
 
 noinst_HEADERS= gui.h \
-                gui_gtk.h \
-                gui_element.h \
-                gui_video.h \
-                gui_audio.h \
-                gui_exec.h \
-                gui_flags.h \
-                gui_banner.h \
-                gui_keys.h \
-                gui_update.h
+                gui_gtk.h \
+                gui_element.h \
+                gui_video.h \
+                gui_audio.h \
+                gui_exec.h \
+                gui_flags.h \
+                gui_banner.h \
+                gui_keys.h \
+                gui_update.h
 
 EXTRA_DIST = rc \

trunk/src/lib/gui/gtk_gui/gui_element.h

@@ -1 @@
-/*! 
+/*!
  * @file gui_element.h
-  *  Definition of ...
+ *  Definition of ...
 
 */
@@ -16 +16 @@
   GuiElement();
   virtual ~GuiElement();
-  
+
   /** @returns the main Widget of this GuiElement. */
-  Widget* getWidget() {return this->mainWidget;}
+  Widget* getWidget() { return this->mainWidget; }
  protected:
   void setMainWidget(Widget* widget);
-  
+
  private:
   Widget* mainWidget;

trunk/src/lib/gui/gtk_gui/gui_exec.cc

@@ -26 +26 @@
 #include "gui_exec.h"
 
+#include "file.h"
 #include "util/loading/resource_manager.h"
 #include "parser/ini_parser/ini_parser.h"
@@ -33 +34 @@
 #include <sys/stat.h>
 #include <sys/types.h>
+
 
 
@@ -147 +149 @@
 void GuiExec::setConfDir(const char* confDir)
 {
-  this->confDir = ResourceManager::homeDirCheck(confDir);
+  this->confDir = File(confDir).name();
 
   PRINTF(5)("Config Directory is: %s.\n", this->confDir);
@@ -199 +201 @@
   IniParser iniParser;
   this->writeFileText(widget, &iniParser, 0);
-  std::string fileName = ResourceManager::homeDirCheck(confFile);
-  iniParser.writeFile(fileName);
+  iniParser.writeFile(File(confFile).name());
 }
 
@@ -253 +254 @@
 void GuiExec::readFromFile(Widget* widget)
 {
-  std::string fileName = ResourceManager::homeDirCheck(confFile);
+  std::string fileName = File(confFile).name();
   IniParser iniParser(fileName);
   if (!iniParser.isOpen())

trunk/src/lib/gui/gtk_gui/gui_update.cc

@@ -51 +51 @@
 
   this->updateFrame = new Frame("Update-Options:");
-  this->updateFrame->setGroupName(CONFIG_SECTION_DATA);
+  this->updateFrame->setGroupName(CONFIG_SECTION_GENERAL);
   this->updateBox = new Box('v');