Changeset 7608 in orxonox.OLD for branches/qt_gui/src/lib/gui/gtk_gui

Timestamp:

May 12, 2006, 10:43:53 AM (19 years ago)

Author:

bensch

Message:

merged the old qt-gui back with
svn merge -r7438:HEAD ​https://svn.orxonox.net/orxonox/branches/qt_gui_old .
minor conflict in BuildLibs.am

Location:

branches/qt_gui/src/lib/gui/gtk_gui

Files:

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

branches/qt_gui/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 \

branches/qt_gui/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;

branches/qt_gui/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');