GTK: made gvbam installable again

src/gtk/main.cpp

@@ -88,13 +88,7 @@ int main(int argc, char * argv[])
 
   Gtk::Window::set_default_icon_name("vbam");
 
-  // Use the glade file from the source folder if it exists
+  std::string sGladeFile = VBA::Window::sGetUiFilePath("vbam.glade");
-  // to make gvbam runnable without installation
-  std::string sGladeFile = "src/gtk/vba.glade";
-  if (!Glib::file_test(sGladeFile, Glib::FILE_TEST_EXISTS))
-  {
-    sGladeFile = PKGDATADIR "/vba.glade";
-  }
 
   Glib::RefPtr<Xml> poXml;
   try

src/gtk/ui/display.ui

@@ -43,7 +43,7 @@
       </row>
     </data>
   </object>
-  <object class="GtkDialog" id="dialog1">
+  <object class="GtkDialog" id="DisplayConfigDialog">
     <property name="border_width">5</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>

src/gtk/window.cpp

@@ -1503,4 +1503,17 @@ void Window::vSDLPollEvents()
   }
 }
 
+std::string Window::sGetUiFilePath(const std::string &_sFileName)
+{
+  // Use the ui file from the source folder if it exists
+  // to make gvbam runnable without installation
+  std::string sUiFile = "src/gtk/ui/" + _sFileName;
+  if (!Glib::file_test(sUiFile, Glib::FILE_TEST_EXISTS))
+  {
+    sUiFile = PKGDATADIR "/ui/" + _sFileName;
+  }
+
+  return sUiFile;
+}
+
 } // VBA namespace

src/gtk/window.h

@@ -45,6 +45,7 @@ public:
   virtual ~Window();
 
   inline static Window * poGetInstance() { return m_poInstance; }
+  static std::string sGetUiFilePath(const std::string &_sFileName);
 
   enum ECartridge
   {

src/gtk/windowcallbacks.cpp

@@ -554,10 +554,11 @@ void Window::vOnJoypadConfigure()
 
 void Window::vOnDisplayConfigure()
 {
-  Glib::RefPtr<Gtk::Builder> poBuilder = Gtk::Builder::create_from_file("src/gtk/ui/display.ui");
+  std::string sUiFile = sGetUiFilePath("display.ui");
+  Glib::RefPtr<Gtk::Builder> poBuilder = Gtk::Builder::create_from_file(sUiFile);
 
   DisplayConfigDialog * poDialog = 0;
-  poBuilder->get_widget_derived("dialog1", poDialog);
+  poBuilder->get_widget_derived("DisplayConfigDialog", poDialog);
   poDialog->vSetConfig(m_poDisplayConfig, this);
   poDialog->set_transient_for(*this);
   poDialog->run();