[gnome-calculator] Removed deprecated GtkTable and added CSS classes. Bug 767394
- From: Robert Roth <robertroth src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calculator] Removed deprecated GtkTable and added CSS classes. Bug 767394
- Date: Tue, 11 Oct 2016 07:00:29 +0000 (UTC)
commit c3894d6ac7f0059aab6f22299313b7ffb0bd9811
Author: Niels De Graef <nielsdegraef gmail com>
Date: Tue Oct 4 13:11:07 2016 +0200
Removed deprecated GtkTable and added CSS classes. Bug 767394
Signed-off-by: Niels De Graef <nielsdegraef gmail com>
data/buttons-advanced.ui | 206 ++---------------
data/buttons-basic.ui | 101 ++--------
data/buttons-financial.ui | 148 ++-----------
data/buttons-programming.ui | 511 +++----------------------------------------
data/calculator.css | 7 +
src/math-buttons.vala | 2 -
6 files changed, 91 insertions(+), 884 deletions(-)
---
diff --git a/data/buttons-advanced.ui b/data/buttons-advanced.ui
index 551d698..eaf1b2a 100644
--- a/data/buttons-advanced.ui
+++ b/data/buttons-advanced.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-naming-policy toplevel-contextual -->
- <object class="GtkTable" id="button_panel">
+ <requires lib="gtk+" version="3.16"/>
+ <object class="GtkGrid" id="button_panel">
<property name="visible">True</property>
- <property name="n_rows">5</property>
- <property name="n_columns">10</property>
- <property name="homogeneous">True</property>
+ <property name="row-homogeneous">True</property>
+ <property name="column-homogeneous">True</property>
<property name="row_spacing">4</property>
<property name="column_spacing">4</property>
<child>
@@ -30,11 +30,7 @@
</object>
<packing>
<property name="left_attach">6</property>
- <property name="right_attach">7</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -53,11 +49,7 @@
</object>
<packing>
<property name="left_attach">5</property>
- <property name="right_attach">6</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -81,11 +73,7 @@
</object>
<packing>
<property name="left_attach">7</property>
- <property name="right_attach">8</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -99,11 +87,7 @@
</object>
<packing>
<property name="left_attach">7</property>
- <property name="right_attach">8</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -123,11 +107,7 @@
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -141,9 +121,6 @@
</object>
<packing>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -157,9 +134,7 @@
</object>
<packing>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -173,11 +148,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -191,11 +162,7 @@
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -209,11 +176,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -227,11 +190,7 @@
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -245,11 +204,7 @@
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -263,9 +218,7 @@
</object>
<packing>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -279,11 +232,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -298,9 +247,7 @@
</object>
<packing>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -314,11 +261,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -332,11 +275,7 @@
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -350,11 +289,7 @@
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -368,11 +303,7 @@
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -386,11 +317,7 @@
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -401,14 +328,13 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
+ <style>
+ <class name="suggested-action"/>
+ </style>
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -427,9 +353,6 @@
</object>
<packing>
<property name="left_attach">5</property>
- <property name="right_attach">6</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -452,8 +375,8 @@
</child>
</object>
<packing>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -477,9 +400,6 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -504,9 +424,6 @@
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -520,9 +437,6 @@
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -536,11 +450,7 @@
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -554,11 +464,7 @@
</object>
<packing>
<property name="left_attach">5</property>
- <property name="right_attach">6</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -602,11 +508,8 @@
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">6</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
@@ -631,11 +534,7 @@
</object>
<packing>
<property name="left_attach">8</property>
- <property name="right_attach">9</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -649,11 +548,7 @@
</object>
<packing>
<property name="left_attach">6</property>
- <property name="right_attach">7</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -667,11 +562,7 @@
</object>
<packing>
<property name="left_attach">8</property>
- <property name="right_attach">9</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -685,11 +576,7 @@
</object>
<packing>
<property name="left_attach">9</property>
- <property name="right_attach">10</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -703,11 +590,7 @@
</object>
<packing>
<property name="left_attach">9</property>
- <property name="right_attach">10</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -720,11 +603,7 @@
</object>
<packing>
<property name="left_attach">8</property>
- <property name="right_attach">9</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -748,11 +627,7 @@
</object>
<packing>
<property name="left_attach">6</property>
- <property name="right_attach">7</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -766,11 +641,7 @@
</object>
<packing>
<property name="left_attach">7</property>
- <property name="right_attach">8</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -789,9 +660,6 @@
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -811,11 +679,7 @@
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -835,19 +699,14 @@
</object>
<packing>
<property name="left_attach">5</property>
- <property name="right_attach">6</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
- <object class="GtkTable" id="table1">
+ <object class="GtkGrid" id="goniometric_buttons">
<property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">3</property>
- <property name="homogeneous">True</property>
+ <property name="row-homogeneous">True</property>
+ <property name="column-homogeneous">True</property>
<property name="row_spacing">4</property>
<property name="column_spacing">4</property>
<child>
@@ -859,8 +718,7 @@
<property name="focus_on_click">False</property>
</object>
<packing>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -873,9 +731,6 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -888,9 +743,6 @@
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -902,10 +754,8 @@
<property name="focus_on_click">False</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -918,11 +768,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -935,18 +781,15 @@
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">6</property>
- <property name="right_attach">10</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">4</property>
+ <property name="height">2</property>
</packing>
</child>
<child>
@@ -987,12 +830,11 @@
</object>
<packing>
<property name="left_attach">9</property>
- <property name="right_attach">10</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
+ <style>
+ <class name="math-buttons"/>
+ </style>
</object>
</interface>
diff --git a/data/buttons-basic.ui b/data/buttons-basic.ui
index 4122744..e6680d1 100644
--- a/data/buttons-basic.ui
+++ b/data/buttons-basic.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-naming-policy toplevel-contextual -->
- <object class="GtkTable" id="button_panel">
+ <requires lib="gtk+" version="3.16"/>
+ <object class="GtkGrid" id="button_panel">
<property name="visible">True</property>
- <property name="n_rows">4</property>
- <property name="n_columns">6</property>
- <property name="homogeneous">True</property>
+ <property name="row-homogeneous">True</property>
+ <property name="column-homogeneous">True</property>
<property name="row_spacing">4</property>
<property name="column_spacing">4</property>
<child>
@@ -19,9 +19,6 @@
</object>
<packing>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -34,8 +31,8 @@
<property name="focus_on_click">False</property>
</object>
<packing>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+ <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -49,9 +46,6 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -65,9 +59,6 @@
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -81,11 +72,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -99,11 +86,7 @@
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -117,9 +100,6 @@
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -132,10 +112,8 @@
<property name="focus_on_click">False</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -149,11 +127,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -168,9 +142,7 @@
</object>
<packing>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -184,11 +156,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -202,11 +170,7 @@
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -220,11 +184,7 @@
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -238,11 +198,7 @@
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -256,11 +212,7 @@
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -274,11 +226,7 @@
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -289,14 +237,14 @@
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
+ <style>
+ <class name="suggested-action"/>
+ </style>
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">6</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
@@ -310,11 +258,7 @@
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -328,11 +272,7 @@
</object>
<packing>
<property name="left_attach">5</property>
- <property name="right_attach">6</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -351,9 +291,6 @@
</object>
<packing>
<property name="left_attach">5</property>
- <property name="right_attach">6</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -367,11 +304,7 @@
</object>
<packing>
<property name="left_attach">5</property>
- <property name="right_attach">6</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -395,11 +328,7 @@
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -418,10 +347,10 @@
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
+ <style>
+ <class name="math-buttons"/>
+ </style>
</object>
</interface>
diff --git a/data/buttons-financial.ui b/data/buttons-financial.ui
index 097fb52..7f2509c 100644
--- a/data/buttons-financial.ui
+++ b/data/buttons-financial.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.16"/>
<object class="GtkDialog" id="ctrm_dialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -1857,13 +1858,11 @@
<action-widget response="-5">button18</action-widget>
</action-widgets>
</object>
- <object class="GtkTable" id="button_panel">
+ <object class="GtkGrid" id="button_panel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">4</property>
- <property name="n_columns">10</property>
- <property name="homogeneous">True</property>
- <property name="row_spacing">4</property>
+ <property name="row-homogeneous">True</property>
+ <property name="column-homogeneous">True</property>
<property name="column_spacing">4</property>
<child>
<object class="GtkButton" id="calc_memory_button">
@@ -1914,11 +1913,8 @@
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">6</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
@@ -1932,11 +1928,7 @@
</object>
<packing>
<property name="left_attach">6</property>
- <property name="right_attach">7</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -1951,9 +1943,7 @@
</object>
<packing>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -1967,8 +1957,8 @@
<property name="focus_on_click">False</property>
</object>
<packing>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -1983,9 +1973,6 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2000,9 +1987,6 @@
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2017,11 +2001,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2036,11 +2016,7 @@
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2055,9 +2031,6 @@
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2072,9 +2045,7 @@
</object>
<packing>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -2089,11 +2060,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2108,10 +2075,8 @@
<property name="focus_on_click">False</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2126,11 +2091,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2145,11 +2106,7 @@
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2164,11 +2121,7 @@
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2183,11 +2136,7 @@
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2202,11 +2151,7 @@
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2221,11 +2166,7 @@
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2237,14 +2178,14 @@
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
+ <style>
+ <class name="suggested-action"/>
+ </style>
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">6</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
@@ -2259,11 +2200,7 @@
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2278,11 +2215,7 @@
</object>
<packing>
<property name="left_attach">5</property>
- <property name="right_attach">6</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2303,9 +2236,6 @@
</object>
<packing>
<property name="left_attach">5</property>
- <property name="right_attach">6</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2320,9 +2250,6 @@
</object>
<packing>
<property name="left_attach">7</property>
- <property name="right_attach">8</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2337,9 +2264,6 @@
</object>
<packing>
<property name="left_attach">8</property>
- <property name="right_attach">9</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2354,9 +2278,6 @@
</object>
<packing>
<property name="left_attach">9</property>
- <property name="right_attach">10</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2371,11 +2292,7 @@
</object>
<packing>
<property name="left_attach">8</property>
- <property name="right_attach">9</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2390,11 +2307,7 @@
</object>
<packing>
<property name="left_attach">9</property>
- <property name="right_attach">10</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2409,11 +2322,7 @@
</object>
<packing>
<property name="left_attach">8</property>
- <property name="right_attach">9</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2428,11 +2337,7 @@
</object>
<packing>
<property name="left_attach">7</property>
- <property name="right_attach">8</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2447,11 +2352,7 @@
</object>
<packing>
<property name="left_attach">9</property>
- <property name="right_attach">10</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2466,11 +2367,7 @@
</object>
<packing>
<property name="left_attach">8</property>
- <property name="right_attach">9</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2485,11 +2382,7 @@
</object>
<packing>
<property name="left_attach">7</property>
- <property name="right_attach">8</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2510,9 +2403,6 @@
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2538,9 +2428,6 @@
</object>
<packing>
<property name="left_attach">6</property>
- <property name="right_attach">7</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2555,12 +2442,11 @@
</object>
<packing>
<property name="left_attach">6</property>
- <property name="right_attach">7</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
+ <style>
+ <class name="math-buttons"/>
+ </style>
</object>
</interface>
diff --git a/data/buttons-programming.ui b/data/buttons-programming.ui
index cd8d636..208902d 100644
--- a/data/buttons-programming.ui
+++ b/data/buttons-programming.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.16"/>
<object class="GtkVBox" id="button_panel">
<property name="visible">True</property>
<property name="spacing">6</property>
@@ -40,10 +41,8 @@
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <object class="GtkTable" id="bit_table">
+ <object class="GtkGrid" id="bit_table">
<property name="visible">True</property>
- <property name="n_rows">4</property>
- <property name="n_columns">39</property>
<child>
<object class="GtkEventBox" id="bit_eventbox_1">
<property name="visible">True</property>
@@ -57,9 +56,6 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -75,9 +71,6 @@
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -93,9 +86,6 @@
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -111,9 +101,6 @@
</object>
<packing>
<property name="left_attach">5</property>
- <property name="right_attach">6</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -129,9 +116,6 @@
</object>
<packing>
<property name="left_attach">6</property>
- <property name="right_attach">7</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -147,9 +131,6 @@
</object>
<packing>
<property name="left_attach">7</property>
- <property name="right_attach">8</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -165,9 +146,6 @@
</object>
<packing>
<property name="left_attach">8</property>
- <property name="right_attach">9</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -183,9 +161,6 @@
</object>
<packing>
<property name="left_attach">10</property>
- <property name="right_attach">11</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -201,9 +176,6 @@
</object>
<packing>
<property name="left_attach">11</property>
- <property name="right_attach">12</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -219,9 +191,6 @@
</object>
<packing>
<property name="left_attach">12</property>
- <property name="right_attach">13</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -237,9 +206,6 @@
</object>
<packing>
<property name="left_attach">13</property>
- <property name="right_attach">14</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -255,9 +221,6 @@
</object>
<packing>
<property name="left_attach">15</property>
- <property name="right_attach">16</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -273,9 +236,6 @@
</object>
<packing>
<property name="left_attach">16</property>
- <property name="right_attach">17</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -291,9 +251,6 @@
</object>
<packing>
<property name="left_attach">17</property>
- <property name="right_attach">18</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -309,9 +266,6 @@
</object>
<packing>
<property name="left_attach">18</property>
- <property name="right_attach">19</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -327,9 +281,6 @@
</object>
<packing>
<property name="left_attach">38</property>
- <property name="right_attach">39</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -345,9 +296,6 @@
</object>
<packing>
<property name="left_attach">37</property>
- <property name="right_attach">38</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -363,9 +311,6 @@
</object>
<packing>
<property name="left_attach">36</property>
- <property name="right_attach">37</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -381,9 +326,6 @@
</object>
<packing>
<property name="left_attach">35</property>
- <property name="right_attach">36</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -399,9 +341,6 @@
</object>
<packing>
<property name="left_attach">33</property>
- <property name="right_attach">34</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -417,9 +356,6 @@
</object>
<packing>
<property name="left_attach">32</property>
- <property name="right_attach">33</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -435,9 +371,6 @@
</object>
<packing>
<property name="left_attach">31</property>
- <property name="right_attach">32</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -453,9 +386,6 @@
</object>
<packing>
<property name="left_attach">30</property>
- <property name="right_attach">31</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -471,9 +401,6 @@
</object>
<packing>
<property name="left_attach">28</property>
- <property name="right_attach">29</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -489,9 +416,6 @@
</object>
<packing>
<property name="left_attach">27</property>
- <property name="right_attach">28</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -507,9 +431,6 @@
</object>
<packing>
<property name="left_attach">26</property>
- <property name="right_attach">27</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -525,9 +446,6 @@
</object>
<packing>
<property name="left_attach">25</property>
- <property name="right_attach">26</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -543,9 +461,6 @@
</object>
<packing>
<property name="left_attach">23</property>
- <property name="right_attach">24</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -561,9 +476,6 @@
</object>
<packing>
<property name="left_attach">22</property>
- <property name="right_attach">23</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -579,9 +491,6 @@
</object>
<packing>
<property name="left_attach">21</property>
- <property name="right_attach">22</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -597,9 +506,6 @@
</object>
<packing>
<property name="left_attach">20</property>
- <property name="right_attach">21</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -610,13 +516,12 @@
<property name="justify">center</property>
<style>
<class name="dim-label"/>
+ <class name="bit-marker-label"/>
</style>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -627,13 +532,12 @@
<property name="justify">center</property>
<style>
<class name="dim-label"/>
+ <class name="bit-marker-label"/>
</style>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -644,34 +548,28 @@
<property name="justify">center</property>
<style>
<class name="dim-label"/>
+ <class name="bit-marker-label"/>
</style>
</object>
<packing>
<property name="left_attach">38</property>
- <property name="right_attach">39</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkLabel" id="bit_marker_label5">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label">0</property>
+ <property name="label"> 0</property>
<property name="justify">center</property>
<style>
<class name="dim-label"/>
+ <class name="bit-marker-label"/>
</style>
</object>
<packing>
<property name="left_attach">38</property>
- <property name="right_attach">39</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -686,10 +584,8 @@
</child>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -705,11 +601,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -725,11 +617,7 @@
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -745,11 +633,7 @@
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -765,11 +649,7 @@
</object>
<packing>
<property name="left_attach">5</property>
- <property name="right_attach">6</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -785,11 +665,7 @@
</object>
<packing>
<property name="left_attach">6</property>
- <property name="right_attach">7</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -805,11 +681,7 @@
</object>
<packing>
<property name="left_attach">7</property>
- <property name="right_attach">8</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -825,11 +697,7 @@
</object>
<packing>
<property name="left_attach">8</property>
- <property name="right_attach">9</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -845,11 +713,7 @@
</object>
<packing>
<property name="left_attach">10</property>
- <property name="right_attach">11</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -865,11 +729,7 @@
</object>
<packing>
<property name="left_attach">11</property>
- <property name="right_attach">12</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -885,11 +745,7 @@
</object>
<packing>
<property name="left_attach">12</property>
- <property name="right_attach">13</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -905,11 +761,7 @@
</object>
<packing>
<property name="left_attach">13</property>
- <property name="right_attach">14</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -925,11 +777,7 @@
</object>
<packing>
<property name="left_attach">15</property>
- <property name="right_attach">16</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -945,11 +793,7 @@
</object>
<packing>
<property name="left_attach">16</property>
- <property name="right_attach">17</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -965,11 +809,7 @@
</object>
<packing>
<property name="left_attach">17</property>
- <property name="right_attach">18</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -985,11 +825,7 @@
</object>
<packing>
<property name="left_attach">18</property>
- <property name="right_attach">19</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1005,11 +841,7 @@
</object>
<packing>
<property name="left_attach">20</property>
- <property name="right_attach">21</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1025,11 +857,7 @@
</object>
<packing>
<property name="left_attach">21</property>
- <property name="right_attach">22</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1045,11 +873,7 @@
</object>
<packing>
<property name="left_attach">22</property>
- <property name="right_attach">23</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1065,11 +889,7 @@
</object>
<packing>
<property name="left_attach">23</property>
- <property name="right_attach">24</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1085,11 +905,7 @@
</object>
<packing>
<property name="left_attach">25</property>
- <property name="right_attach">26</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1105,11 +921,7 @@
</object>
<packing>
<property name="left_attach">26</property>
- <property name="right_attach">27</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1125,11 +937,7 @@
</object>
<packing>
<property name="left_attach">27</property>
- <property name="right_attach">28</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1145,11 +953,7 @@
</object>
<packing>
<property name="left_attach">28</property>
- <property name="right_attach">29</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1165,11 +969,7 @@
</object>
<packing>
<property name="left_attach">30</property>
- <property name="right_attach">31</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1185,11 +985,7 @@
</object>
<packing>
<property name="left_attach">31</property>
- <property name="right_attach">32</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1205,11 +1001,7 @@
</object>
<packing>
<property name="left_attach">32</property>
- <property name="right_attach">33</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1225,11 +1017,7 @@
</object>
<packing>
<property name="left_attach">33</property>
- <property name="right_attach">34</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1245,11 +1033,7 @@
</object>
<packing>
<property name="left_attach">35</property>
- <property name="right_attach">36</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1265,11 +1049,7 @@
</object>
<packing>
<property name="left_attach">36</property>
- <property name="right_attach">37</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1285,11 +1065,7 @@
</object>
<packing>
<property name="left_attach">37</property>
- <property name="right_attach">38</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1305,11 +1081,7 @@
</object>
<packing>
<property name="left_attach">38</property>
- <property name="right_attach">39</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1320,15 +1092,12 @@
<property name="justify">center</property>
<style>
<class name="dim-label"/>
+ <class name="bit-marker-label"/>
</style>
</object>
<packing>
<property name="left_attach">20</property>
- <property name="right_attach">21</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1339,15 +1108,12 @@
<property name="justify">center</property>
<style>
<class name="dim-label"/>
+ <class name="bit-marker-label"/>
</style>
</object>
<packing>
<property name="left_attach">20</property>
- <property name="right_attach">21</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1358,9 +1124,6 @@
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1371,9 +1134,6 @@
</object>
<packing>
<property name="left_attach">9</property>
- <property name="right_attach">10</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1384,9 +1144,6 @@
</object>
<packing>
<property name="left_attach">14</property>
- <property name="right_attach">15</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1397,9 +1154,6 @@
</object>
<packing>
<property name="left_attach">19</property>
- <property name="right_attach">20</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1410,9 +1164,6 @@
</object>
<packing>
<property name="left_attach">24</property>
- <property name="right_attach">25</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1423,9 +1174,6 @@
</object>
<packing>
<property name="left_attach">29</property>
- <property name="right_attach">30</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1436,9 +1184,6 @@
</object>
<packing>
<property name="left_attach">34</property>
- <property name="right_attach">35</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1449,11 +1194,7 @@
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1464,11 +1205,7 @@
</object>
<packing>
<property name="left_attach">9</property>
- <property name="right_attach">10</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1479,11 +1216,7 @@
</object>
<packing>
<property name="left_attach">14</property>
- <property name="right_attach">15</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1494,11 +1227,7 @@
</object>
<packing>
<property name="left_attach">19</property>
- <property name="right_attach">20</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1509,11 +1238,7 @@
</object>
<packing>
<property name="left_attach">24</property>
- <property name="right_attach">25</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1524,11 +1249,7 @@
</object>
<packing>
<property name="left_attach">29</property>
- <property name="right_attach">30</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1539,11 +1260,7 @@
</object>
<packing>
<property name="left_attach">34</property>
- <property name="right_attach">35</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1558,8 +1275,7 @@
</child>
</object>
<packing>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
</packing>
</child>
<child>
@@ -1787,11 +1503,10 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="advanced_panel">
+ <object class="GtkGrid" id="advanced_panel">
<property name="visible">True</property>
- <property name="n_rows">5</property>
- <property name="n_columns">10</property>
- <property name="homogeneous">True</property>
+ <property name="row-homogeneous">True</property>
+ <property name="column-homogeneous">True</property>
<property name="row_spacing">4</property>
<property name="column_spacing">4</property>
<child>
@@ -1805,11 +1520,7 @@
</object>
<packing>
<property name="left_attach">7</property>
- <property name="right_attach">8</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -1822,11 +1533,7 @@
</object>
<packing>
<property name="left_attach">7</property>
- <property name="right_attach">8</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -1845,11 +1552,7 @@
</object>
<packing>
<property name="left_attach">7</property>
- <property name="right_attach">8</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -1863,11 +1566,7 @@
</object>
<packing>
<property name="left_attach">8</property>
- <property name="right_attach">9</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -1892,11 +1591,7 @@
</object>
<packing>
<property name="left_attach">8</property>
- <property name="right_attach">9</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -1910,11 +1605,7 @@
</object>
<packing>
<property name="left_attach">9</property>
- <property name="right_attach">10</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -1928,11 +1619,7 @@
</object>
<packing>
<property name="left_attach">9</property>
- <property name="right_attach">10</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -1946,11 +1633,7 @@
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -1964,10 +1647,8 @@
<property name="focus_on_click">False</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -1981,11 +1662,7 @@
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -1999,11 +1676,7 @@
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2017,11 +1690,7 @@
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2032,14 +1701,13 @@
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
+ <style>
+ <class name="suggested-action"/>
+ </style>
</object>
<packing>
<property name="left_attach">6</property>
- <property name="right_attach">7</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2058,11 +1726,7 @@
</object>
<packing>
<property name="left_attach">6</property>
- <property name="right_attach">7</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2076,11 +1740,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2094,11 +1754,7 @@
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2112,11 +1768,7 @@
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2129,10 +1781,8 @@
<property name="focus_on_click">False</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2146,11 +1796,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2164,11 +1810,7 @@
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2182,11 +1824,7 @@
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2199,10 +1837,8 @@
<property name="focus_on_click">False</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2216,11 +1852,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2234,11 +1866,7 @@
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2252,11 +1880,7 @@
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2269,10 +1893,8 @@
<property name="focus_on_click">False</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2286,11 +1908,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2304,11 +1922,7 @@
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2322,11 +1936,7 @@
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2349,8 +1959,8 @@
</child>
</object>
<packing>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -2374,9 +1984,6 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2390,9 +1997,6 @@
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2434,9 +2038,6 @@
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2450,11 +2051,7 @@
</object>
<packing>
<property name="left_attach">5</property>
- <property name="right_attach">6</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2468,11 +2065,7 @@
</object>
<packing>
<property name="left_attach">5</property>
- <property name="right_attach">6</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2486,11 +2079,7 @@
</object>
<packing>
<property name="left_attach">5</property>
- <property name="right_attach">6</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2504,11 +2093,7 @@
</object>
<packing>
<property name="left_attach">5</property>
- <property name="right_attach">6</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2522,9 +2107,6 @@
</object>
<packing>
<property name="left_attach">4</property>
- <property name="right_attach">5</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2538,9 +2120,6 @@
</object>
<packing>
<property name="left_attach">5</property>
- <property name="right_attach">6</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2583,9 +2162,6 @@
</object>
<packing>
<property name="left_attach">6</property>
- <property name="right_attach">7</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2628,9 +2204,6 @@
</object>
<packing>
<property name="left_attach">7</property>
- <property name="right_attach">8</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2648,9 +2221,6 @@
</object>
<packing>
<property name="left_attach">8</property>
- <property name="right_attach">9</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2664,11 +2234,7 @@
</object>
<packing>
<property name="left_attach">6</property>
- <property name="right_attach">7</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2692,11 +2258,7 @@
</object>
<packing>
<property name="left_attach">8</property>
- <property name="right_attach">9</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2721,11 +2283,7 @@
</object>
<packing>
<property name="left_attach">9</property>
- <property name="right_attach">10</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2749,11 +2307,7 @@
</object>
<packing>
<property name="left_attach">8</property>
- <property name="right_attach">9</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2767,11 +2321,7 @@
</object>
<packing>
<property name="left_attach">6</property>
- <property name="right_attach">7</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2785,11 +2335,7 @@
</object>
<packing>
<property name="left_attach">7</property>
- <property name="right_attach">8</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
@@ -2803,16 +2349,15 @@
</object>
<packing>
<property name="left_attach">8</property>
- <property name="right_attach">9</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
<placeholder/>
</child>
+ <style>
+ <class name="math-buttons"/>
+ </style>
</object>
<packing>
<property name="position">2</property>
diff --git a/data/calculator.css b/data/calculator.css
index 003a796..f137247 100644
--- a/data/calculator.css
+++ b/data/calculator.css
@@ -1,3 +1,10 @@
.history-view {
border-width: 0 0 1px 0;
}
+
+.math-buttons {
+}
+
+.bit-marker-label {
+}
+
diff --git a/src/math-buttons.vala b/src/math-buttons.vala
index 6c549ba..7ecef6c 100644
--- a/src/math-buttons.vala
+++ b/src/math-buttons.vala
@@ -621,8 +621,6 @@ public class MathButtons : Gtk.Box
var button = builder.get_object (widget_name) as Gtk.Button;
if (button == null)
return;
- if (name == "result") /* Adds blue color to result button */
- button.get_style_context ().add_class ("suggested-action");
if (data != null)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
