Improved Layer Selection

* Removed Slider for opacity. Use Color Dialog instead
* Implement Layer loading
* remove Spinner from header bar

glade/CMakeLists.txt

@@ -1,6 +1,8 @@
 add_custom_target(glib-resources DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/resources.c)
 add_custom_command(DEPENDS
-			 ${CMAKE_CURRENT_SOURCE_DIR}/resources.xml
+                         ${CMAKE_CURRENT_SOURCE_DIR}/resources.xml
+			 ${CMAKE_CURRENT_SOURCE_DIR}/main.glade
+			 ${CMAKE_CURRENT_SOURCE_DIR}/layer-widget.glade
 		   OUTPUT
 			${CMAKE_CURRENT_BINARY_DIR}/resources.c
 		   COMMAND

glade/layer-widget.glade

@@ -3,10 +3,10 @@
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">100</property>
-    <property name="value">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="upper">1</property>
+    <property name="value">1</property>
+    <property name="step_increment">0.01</property>
+    <property name="page_increment">0.10000000000000001</property>
   </object>
   <object class="GtkBox" id="box">
     <property name="visible">True</property>
@@ -29,6 +29,9 @@
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">True</property>
+        <property name="use_alpha">True</property>
+        <property name="title" translatable="yes">Select Layer Color and Opacity</property>
+        <property name="rgba">rgb(0,0,0)</property>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -36,24 +39,6 @@
         <property name="position">1</property>
       </packing>
     </child>
-    <child>
-      <object class="GtkScale" id="opacity">
-        <property name="width_request">150</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="adjustment">adjustment1</property>
-        <property name="restrict_to_fill_level">False</property>
-        <property name="fill_level">100</property>
-        <property name="round_digits">0</property>
-        <property name="digits">0</property>
-        <property name="value_pos">right</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">2</property>
-      </packing>
-    </child>
     <child>
       <object class="GtkCheckButton" id="export">
         <property name="label" translatable="yes">Export Layer</property>
@@ -65,7 +50,7 @@
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="position">3</property>
+        <property name="position">2</property>
       </packing>
     </child>
     <child>
@@ -76,7 +61,7 @@
       <packing>
         <property name="expand">True</property>
         <property name="fill">True</property>
-        <property name="position">4</property>
+        <property name="position">3</property>
       </packing>
     </child>
   </object>

glade/main.glade

@@ -36,18 +36,6 @@
                 <property name="position">0</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkSpinner">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="active">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
             <child>
               <object class="GtkButton" id="button-load-mapping">
                 <property name="label" translatable="yes">Load Mapping</property>

glade/resources.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource>
+  <gresource prefix="/">
     <file compressed="true">main.glade</file>
     <file>layer-widget.glade</file>
   </gresource>