summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2019-03-11 02:47:29 +0000
committerJose Antonio Ortega Ruiz <jao@gnu.org>2020-10-18 17:47:53 +0100
commitb66baaeceb5c9d666ad8807a6f9fc4567187d50d (patch)
treec0f3ee0970fee1832c72d739b084e21d2692f296
parent828ce747d2263dfed13325feac25bc5b1ad83e9b (diff)
downloadmdk-b66baaeceb5c9d666ad8807a6f9fc4567187d50d.tar.gz
mdk-b66baaeceb5c9d666ad8807a6f9fc4567187d50d.tar.bz2
Work in progress
-rw-r--r--mixgtk/mixgtk.glade88
-rw-r--r--mixgtk/mixgtk.gladep9
-rw-r--r--mixgtk/mixgtk_device.c7
-rw-r--r--mixgtk/mixgtk_fontsel.c5
-rw-r--r--mixgtk/mixgtk_gen_handlers.c8
-rw-r--r--mixgtk/mixgtk_mixal.c20
6 files changed, 68 insertions, 69 deletions
diff --git a/mixgtk/mixgtk.glade b/mixgtk/mixgtk.glade
index 20996ae..e2f79a9 100644
--- a/mixgtk/mixgtk.glade
+++ b/mixgtk/mixgtk.glade
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<interface>
- <requires lib="gtk+" version="3.2"/>
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="about_dialog">
<property name="can_focus">False</property>
<property name="border_width">2</property>
@@ -65,10 +65,11 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkVBox" id="vbox9">
+ <object class="GtkBox" id="vbox9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">15</property>
+ <property name="orientation">vertical</property>
<property name="spacing">10</property>
<child>
<object class="GtkLabel" id="label1441">
@@ -232,7 +233,7 @@ Free Software Foundation, Inc&lt;/small&gt;</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox1">
+ <object class="GtkBox" id="hbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">25</property>
@@ -369,9 +370,6 @@ Free Software Foundation, Inc&lt;/small&gt;</property>
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
<object class="GtkFixed" id="fixed2">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -387,8 +385,8 @@ Free Software Foundation, Inc&lt;/small&gt;</property>
<signal name="clicked" handler="on_devset_button_clicked" swapped="no"/>
</object>
<packing>
- <property name="x">233</property>
- <property name="y">31</property>
+ <property name="x">241</property>
+ <property name="y">34</property>
</packing>
</child>
<child>
@@ -420,6 +418,19 @@ Free Software Foundation, Inc&lt;/small&gt;</property>
</packing>
</child>
<child>
+ <object class="GtkComboBox" id="dev_combo">
+ <property name="width_request">200</property>
+ <property name="height_request">15</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="margin_right">16</property>
+ <property name="popup_fixed_width">False</property>
+ </object>
+ <packing>
+ <property name="x">92</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkRadioButton" id="wordradio">
<property name="label" translatable="yes">Word</property>
<property name="width_request">0</property>
@@ -453,19 +464,6 @@ Free Software Foundation, Inc&lt;/small&gt;</property>
<property name="y">34</property>
</packing>
</child>
- <child>
- <object class="GtkComboBox" id="dev_combo">
- <property name="width_request">100</property>
- <property name="height_request">67</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_right">89</property>
- </object>
- <packing>
- <property name="x">92</property>
- <property name="y">22</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -494,9 +492,10 @@ Free Software Foundation, Inc&lt;/small&gt;</property>
<placeholder/>
</child>
<child>
- <object class="GtkVBox" id="vbox4">
+ <object class="GtkBox" id="vbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkHandleBox" id="dev_tb_handle">
<property name="visible">True</property>
@@ -597,9 +596,10 @@ Free Software Foundation, Inc&lt;/small&gt;</property>
</packing>
</child>
<child>
- <object class="GtkVBox" id="dev_container">
+ <object class="GtkBox" id="dev_container">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
@@ -676,9 +676,10 @@ Free Software Foundation, Inc&lt;/small&gt;</property>
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox2">
+ <object class="GtkBox" id="vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkFixed" id="fixed3">
@@ -894,10 +895,11 @@ Free Software Foundation, Inc&lt;/small&gt;</property>
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="label225">
<property name="visible">True</property>
@@ -940,7 +942,6 @@ Free Software Foundation, Inc&lt;/small&gt;</property>
</action-widgets>
</object>
<object class="GtkDialog" id="input_dialog">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">MIX Console input</property>
<property name="resizable">False</property>
@@ -987,10 +988,11 @@ Free Software Foundation, Inc&lt;/small&gt;</property>
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox7">
+ <object class="GtkBox" id="vbox7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
+ <property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="label1438">
@@ -1041,10 +1043,11 @@ Free Software Foundation, Inc&lt;/small&gt;</property>
<placeholder/>
</child>
<child>
- <object class="GtkVBox" id="main_vbox">
+ <object class="GtkBox" id="main_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">2</property>
+ <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkMenuBar" id="mainmenubar">
@@ -1717,9 +1720,10 @@ Free Software Foundation, Inc&lt;/small&gt;</property>
</packing>
</child>
<child>
- <object class="GtkVBox" id="prompt_vbox">
+ <object class="GtkBox" id="prompt_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkScrolledWindow" id="mixlog_scrolledwindow">
<property name="visible">True</property>
@@ -1792,9 +1796,10 @@ Free Software Foundation, Inc&lt;/small&gt;</property>
<placeholder/>
</child>
<child>
- <object class="GtkVBox" id="vbox5">
+ <object class="GtkBox" id="vbox5">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkHandleBox" id="mixal_tb_handle">
<property name="visible">True</property>
@@ -1925,9 +1930,10 @@ Free Software Foundation, Inc&lt;/small&gt;</property>
</packing>
</child>
<child>
- <object class="GtkVBox" id="mixal_container">
+ <object class="GtkBox" id="mixal_container">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
@@ -1961,9 +1967,10 @@ Free Software Foundation, Inc&lt;/small&gt;</property>
<placeholder/>
</child>
<child>
- <object class="GtkVBox" id="vbox8">
+ <object class="GtkBox" id="vbox8">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkHandleBox" id="mixvm_tb_handle">
<property name="visible">True</property>
@@ -2029,14 +2036,15 @@ Free Software Foundation, Inc&lt;/small&gt;</property>
<property name="border_width">5</property>
<property name="label_xalign">0</property>
<child>
- <object class="GtkHBox" id="mixvm_widget">
+ <object class="GtkBox" id="mixvm_widget">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkVBox" id="vbox6">
+ <object class="GtkBox" id="vbox6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">1</property>
+ <property name="orientation">vertical</property>
<property name="spacing">1</property>
<child>
<object class="GtkFrame" id="frame3">
@@ -2352,7 +2360,7 @@ Free Software Foundation, Inc&lt;/small&gt;</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox22">
+ <object class="GtkBox" id="hbox22">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -2395,7 +2403,7 @@ Free Software Foundation, Inc&lt;/small&gt;</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox7">
+ <object class="GtkBox" id="hbox7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -2405,7 +2413,7 @@ Free Software Foundation, Inc&lt;/small&gt;</property>
<property name="border_width">2</property>
<property name="label_xalign">0</property>
<child>
- <object class="GtkHBox" id="hbox6">
+ <object class="GtkBox" id="hbox6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">1</property>
@@ -2516,7 +2524,7 @@ Free Software Foundation, Inc&lt;/small&gt;</property>
<property name="border_width">2</property>
<property name="label_xalign">0</property>
<child>
- <object class="GtkHBox" id="hbox2">
+ <object class="GtkBox" id="hbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">4</property>
@@ -2585,7 +2593,7 @@ Free Software Foundation, Inc&lt;/small&gt;</property>
<property name="border_width">2</property>
<property name="label_xalign">0</property>
<child>
- <object class="GtkHBox" id="hbox4">
+ <object class="GtkBox" id="hbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -2782,7 +2790,7 @@ Free Software Foundation, Inc&lt;/small&gt;</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <object class="GtkHBox" id="hbox36">
+ <object class="GtkBox" id="hbox36">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
diff --git a/mixgtk/mixgtk.gladep b/mixgtk/mixgtk.gladep
deleted file mode 100644
index 40a311a..0000000
--- a/mixgtk/mixgtk.gladep
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
-
-<glade-project>
- <name>Mixgtk</name>
- <program_name>mixgtk</program_name>
- <pixmaps_directory>.</pixmaps_directory>
- <gnome_support>FALSE</gnome_support>
-</glade-project>
diff --git a/mixgtk/mixgtk_device.c b/mixgtk/mixgtk_device.c
index 88fdfd1..6496851 100644
--- a/mixgtk/mixgtk_device.c
+++ b/mixgtk/mixgtk_device.c
@@ -195,6 +195,7 @@ init_input_widgets_ (void)
gtk_entry_completion_set_minimum_key_length (completion, 1);
gtk_entry_completion_set_text_column (completion, 0);
gtk_entry_set_completion (input_dlg_entry_, completion);
+ gtk_widget_hide (input_dlg_);
}
static gboolean
@@ -339,7 +340,7 @@ mixgtk_device_construct_gui_ (struct mixgtk_device_t *dev)
gtk_tree_view_new_with_model (GTK_TREE_MODEL (bindev->store));
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (dev->widget), FALSE);
- gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (dev->widget), TRUE);
+ // gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (dev->widget), TRUE);
for (k = 0; k < BIN_DEV_COL_; ++k)
{
@@ -593,8 +594,8 @@ on_devdir_browse_clicked ()
gtk_file_chooser_dialog_new (_("Devices folder"),
GTK_WINDOW (devdir_dlg_),
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ "_Cancel", GTK_RESPONSE_CANCEL,
+ "_Open", GTK_RESPONSE_ACCEPT,
NULL);
if (current != NULL)
diff --git a/mixgtk/mixgtk_fontsel.c b/mixgtk/mixgtk_fontsel.c
index ac5c881..b9812a1 100644
--- a/mixgtk/mixgtk_fontsel.c
+++ b/mixgtk/mixgtk_fontsel.c
@@ -43,7 +43,7 @@ static void
init_fontsel_ (void)
{
fontsel_dialog_ =
- GTK_FONT_SELECTION_DIALOG
+ GTK_FONT_CHOOSER_DIALOG
(mixgtk_widget_factory_get_dialog (MIXGTK_FONTSEL_DIALOG));
g_assert (fontsel_dialog_ != NULL);
}
@@ -68,7 +68,8 @@ mixgtk_fontsel_set_font (mixgtk_font_t f, GtkWidget *w)
if (font_desc)
{
- gtk_widget_modify_font (w, font_desc);
+ // deprecated... some silly CSS stuff instead
+ // gtk_widget_override_font (w, font_desc);
gtk_widget_queue_draw (w);
pango_font_description_free (font_desc);
}
diff --git a/mixgtk/mixgtk_gen_handlers.c b/mixgtk/mixgtk_gen_handlers.c
index 010bdc1..64fb06f 100644
--- a/mixgtk/mixgtk_gen_handlers.c
+++ b/mixgtk/mixgtk_gen_handlers.c
@@ -1,7 +1,7 @@
/* -*-c-*- -------------- mixgtk_gen_handlers.c :
* Implementation of the functions declared in mixgtk_gen_handlers.h
* ------------------------------------------------------------------
- * Copyright (C) 2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2004, 2006, 2007, 2019 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -40,8 +40,8 @@ get_chooser_ (const gchar *title, gboolean src)
(gtk_file_chooser_dialog_new ("gmixvm",
NULL,
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ "_Cancel", GTK_RESPONSE_CANCEL,
+ "_Open", GTK_RESPONSE_ACCEPT,
NULL));
src_filter = gtk_file_filter_new ();
gtk_file_filter_add_pattern (src_filter, "*.mixal");
@@ -194,5 +194,3 @@ on_save_activate (GtkWidget *w, gpointer data)
{
mixgtk_config_save ();
}
-
-
diff --git a/mixgtk/mixgtk_mixal.c b/mixgtk/mixgtk_mixal.c
index 7ea8c75..5f8597b 100644
--- a/mixgtk/mixgtk_mixal.c
+++ b/mixgtk/mixgtk_mixal.c
@@ -147,7 +147,7 @@ fill_symbols_ (const mix_symbol_table_t *table)
static void
init_clist_ (void)
{
- GtkStockItem item;
+ // GtkStockItem item;
GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
GtkCellRenderer *bprenderer = gtk_cell_renderer_pixbuf_new ();
@@ -165,7 +165,7 @@ init_clist_ (void)
gtk_tree_view_set_model (clist_, GTK_TREE_MODEL (clist_store_));
g_object_unref (G_OBJECT (clist_store_));
- gtk_tree_view_set_rules_hint (clist_, TRUE);
+ // gtk_tree_view_set_rules_hint (clist_, TRUE);
gtk_tree_view_append_column
(clist_,
@@ -189,15 +189,15 @@ init_clist_ (void)
"text", CLIST_CODE_COL,
NULL));
- if (gtk_stock_lookup (GTK_STOCK_STOP, &item))
- {
- bp_stock_id_ = item.stock_id;
- }
+ /* if (gtk_stock_lookup (GTK_STOCK_STOP, &item)) */
+ /* { */
+ /* bp_stock_id_ = item.stock_id; */
+ /* } */
- if (gtk_stock_lookup (GTK_STOCK_GO_FORWARD, &item))
- {
- pc_stock_id_ = item.stock_id;
- }
+ /* if (gtk_stock_lookup (GTK_STOCK_GO_FORWARD, &item)) */
+ /* { */
+ /* pc_stock_id_ = item.stock_id; */
+ /* } */
symbols_dlg_ = NULL;
symbols_view_ = NULL;