internalize rexml
[booh] / bin / booh
index d27fa9761a35a20145638bf11b73a0a5fc751797..4127984f497345fa0e92d1b0b0fac09ab8d4c6a8 100755 (executable)
--- a/bin/booh
+++ b/bin/booh
@@ -31,7 +31,7 @@ require 'gettext'
 include GetText
 bindtextdomain("booh")
 
-require 'rexml/document'
+require 'booh/rexml/document'
 include REXML
 
 require 'booh/booh-lib'
@@ -3174,6 +3174,8 @@ def new_album
         destdir = from_utf8(dest.text)
         configskel = File.expand_path(from_utf8(conf.text))
         theme = theme_button.label
+        #- some sort of automatic theme preference
+        $config['default-theme'] = theme
         sizes = theme_sizes.find_all { |e| e[:widget].active? }.collect { |e| e[:value] }.join(',')
         nperrow = nperrows.find { |e| e[:widget].active? }[:value]
         nperpage = nperpage_model.get_value(nperpagecombo.active_iter, 1)
@@ -3361,8 +3363,12 @@ def properties
     save_madewith = madewithentry.text.gsub('"', '"').gsub('\'', ''')
     save_indexlink = indexlinkentry.text.gsub('"', '"').gsub('\'', ''')
     dialog.destroy
-
+    
     if ok && (save_theme != theme || save_limit_sizes != limit_sizes || save_opt432 != opt432 || save_nperrow != nperrow || save_nperpage != nperpage || save_madewith != madewith || save_indexlink != indexlinkentry)
+        if save_theme != theme
+            #- some sort of automatic theme preference
+            $config['default-theme'] = save_theme
+        end
         mark_document_as_dirty
         save_current_file
         call_backend("booh-backend --use-config '#{$filename}' --for-gui --verbose-level #{$verbose_level} " +