lbxgui: Add support for external palettes.

diff --git a/src/gui/lbxgui.c b/src/gui/lbxgui.c
index 33dfdd85704961da6ade634e380f64ed9d2e1205..650f2630fe463927e6ccc861647d358a98b172c9 100644 (file)
--- a/src/gui/lbxgui.c
+++ b/src/gui/lbxgui.c
@@ -169,7 +169,7 @@ gboolean canvas_expose(GtkWidget *canvas, GdkEventExpose *event, gpointer data)
        return TRUE;
 }
 
-static int init_framedata(void)
+static int init_framedata(int reset)
 {
        struct lbx_imginfo info;
        GtkSpinButton *spin;
@@ -197,6 +197,31 @@ static int img_close(void *handle)
        return 0;
 }
 
+void set_palette_data(GtkComboBox *combo)
+{
+       GtkTreeIter iter;
+       gpointer lbx;
+       guint    index;
+       LBXfile  *f;
+
+       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) {
+               if (lbximg_loadpalette(f, &lbx_arch_fops, palette_external))
+                       memset(palette_external, 0, sizeof palette_external);
+               lbx_file_close(f);
+       }
+
+       init_framedata(0);
+}
+
 void set_image_data(GtkComboBox *combo)
 {
        GtkTreeIter iter;
@@ -224,7 +249,7 @@ void set_image_data(GtkComboBox *combo)
                                lbximg_close(image);
                        }
 
-                       if (init_framedata() == -1) {
+                       if (init_framedata(1) == -1) {
                                puts("crap");
                                lbximg_close(image);
                        }
@@ -356,6 +381,10 @@ static void interface_init(void)
        gtk_tree_view_set_model(tree, GTK_TREE_MODEL(archives));
        gtk_tree_view_append_column(tree, column);
 
+       combo = GTK_COMBO_BOX(gtk_builder_get_object(builder, "palettechooser"));
+       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, "imagechooser"));
        gtk_combo_box_set_model(combo, GTK_TREE_MODEL(archives));
        gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(combo), 0);
@@ -388,7 +417,7 @@ int main(int argc, char **argv)
        interface_init();
        gtk_builder_connect_signals(builder, window);
 
-       g_timeout_add(33, timeout, NULL);
+       g_timeout_add(10, timeout, NULL);
        gtk_widget_show_all(window);
        gtk_main();
 }

diff --git a/src/gui/lbxgui.glade b/src/gui/lbxgui.glade
index 510098bf0afec3c3956072180a47b77e12cdea41..53e5ce2d5cbc0ae223a08f0d44e89158b4f80d26 100644 (file)
--- a/src/gui/lbxgui.glade
+++ b/src/gui/lbxgui.glade
@@ -104,6 +104,27 @@
                 <child>
                   <object class="GtkHBox" id="hbox1">
                     <property name="visible">True</property>
+                    <child>
+                      <object class="GtkLabel" id="label3">
+                        <property name="visible">True</property>
+                        <property name="xalign">1</property>
+                        <property name="xpad">4</property>
+                        <property name="label" translatable="yes">Palette:</property>
+                      </object>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBoxEntry" id="palettechooser">
+                        <property name="visible">True</property>
+                        <signal name="changed" handler="set_palette_data"/>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                     <child>
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
@@ -113,7 +134,7 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="position">0</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
@@ -124,7 +145,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="padding">3</property>
-                        <property name="position">1</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
@@ -135,7 +156,7 @@
                         <property name="label" translatable="yes">Frame:</property>
                       </object>
                       <packing>
-                        <property name="position">2</property>
+                        <property name="position">4</property>
                       </packing>
                     </child>
                     <child>
@@ -148,7 +169,7 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="position">3</property>
+                        <property name="position">5</property>
                       </packing>
                     </child>
                     <child>
@@ -167,12 +188,13 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="padding">3</property>
-                        <property name="position">4</property>
+                        <property name="position">6</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="padding">3</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
@@ -180,11 +202,17 @@
                   <object class="GtkViewport" id="viewport">
                     <property name="visible">True</property>
                     <property name="resize_mode">queue</property>
-                    <property name="shadow_type">etched-in</property>
                     <child>
-                      <object class="GtkDrawingArea" id="canvas">
+                      <object class="GtkAlignment" id="alignment1">
                         <property name="visible">True</property>
-                        <signal name="expose_event" handler="canvas_expose"/>
+                        <property name="xscale">0</property>
+                        <property name="yscale">0</property>
+                        <child>
+                          <object class="GtkDrawingArea" id="canvas">
+                            <property name="visible">True</property>
+                            <signal name="expose_event" handler="canvas_expose"/>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>