lbxgui: Add support for override palettes.

diff --git a/src/gui/lbxgui.c b/src/gui/lbxgui.c
index 650f2630fe463927e6ccc861647d358a98b172c9..21dee9ab5f06bfc7e8325238781d0fda5c387ac8 100644 (file)
--- a/src/gui/lbxgui.c
+++ b/src/gui/lbxgui.c
@@ -174,6 +174,9 @@ static int init_framedata(int reset)
        struct lbx_imginfo info;
        GtkSpinButton *spin;
 
+       if (!image)
+               return 0;
+
        lbximg_getinfo(image, &info);
        framebuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8,
                info.width, info.height);
@@ -197,6 +200,38 @@ static int img_close(void *handle)
        return 0;
 }
 
+void set_override_data(GtkComboBox *combo)
+{
+       GtkTreeIter iter;
+       gpointer lbx;
+       guint    index;
+       LBXfile  *f;
+       LBX_IMG  *img;
+
+       if (!gtk_combo_box_get_active_iter(combo, &iter))
+               return;
+
+       gtk_tree_model_get(GTK_TREE_MODEL(archives), &iter,
+               1, &lbx,
+               2, &index,
+               -1);
+
+       f = lbx_file_open(lbx, index);
+       if (f) {
+               img = lbximg_open(f, &lbx_arch_fops, NULL);
+               if (img) {
+                       memset(palette_override, 0, sizeof palette_override);
+                       lbximg_getpalette(img, palette_override);
+                       lbximg_close(img);
+                       init_framedata(0);
+               }
+
+               lbx_file_close(f);
+       } else {
+               puts("damn");
+       }
+}
+
 void set_palette_data(GtkComboBox *combo)
 {
        GtkTreeIter iter;
@@ -239,8 +274,6 @@ void set_image_data(GtkComboBox *combo)
 
        f = lbx_file_open(lbx, index);
        if (f) {
-               struct lbx_imginfo info;
-
                image = lbximg_open(f, &lbx_arch_fops, img_close);
                if (image) {
                        memset(palette_internal, 0, sizeof palette_internal);
@@ -388,6 +421,10 @@ static void interface_init(void)
        combo = GTK_COMBO_BOX(gtk_builder_get_object(builder, "imagechooser"));
        gtk_combo_box_set_model(combo, GTK_TREE_MODEL(archives));
        gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(combo), 0);
+
+       combo = GTK_COMBO_BOX(gtk_builder_get_object(builder, "overchooser"));
+       gtk_combo_box_set_model(combo, GTK_TREE_MODEL(archives));
+       gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(combo), 0);
 }
 
 int main(int argc, char **argv)

diff --git a/src/gui/lbxgui.glade b/src/gui/lbxgui.glade
index 53e5ce2d5cbc0ae223a08f0d44e89158b4f80d26..8b442499068752314d05a99fa95201ac60fcf4a8 100644 (file)
--- a/src/gui/lbxgui.glade
+++ b/src/gui/lbxgui.glade
@@ -148,6 +148,26 @@
                         <property name="position">3</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkLabel" id="label4">
+                        <property name="visible">True</property>
+                        <property name="xalign">1</property>
+                        <property name="xpad">3</property>
+                        <property name="label" translatable="yes">Override:</property>
+                      </object>
+                      <packing>
+                        <property name="position">4</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBoxEntry" id="overchooser">
+                        <property name="visible">True</property>
+                        <signal name="changed" handler="set_override_data"/>
+                      </object>
+                      <packing>
+                        <property name="position">5</property>
+                      </packing>
+                    </child>
                     <child>
                       <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
@@ -156,7 +176,7 @@
                         <property name="label" translatable="yes">Frame:</property>
                       </object>
                       <packing>
-                        <property name="position">4</property>
+                        <property name="position">6</property>
                       </packing>
                     </child>
                     <child>
@@ -169,7 +189,7 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="position">5</property>
+                        <property name="position">7</property>
                       </packing>
                     </child>
                     <child>
@@ -188,7 +208,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="padding">3</property>
-                        <property name="position">6</property>
+                        <property name="position">8</property>
                       </packing>
                     </child>
                   </object>