[Vice-emu-commit] SF.net SVN: vice-emu:[34328] trunk/vice/src/arch/gtk3
Versatile Commodore Emulator
Brought to you by:
blackystardust,
gpz
Menu
▾
▴
[Vice-emu-commit] SF.net SVN: vice-emu:[34328] trunk/vice/src/arch/gtk3
|
From: <co...@us...> - 2018-01-17 15:22:40
|
Revision: 34328
http://sourceforge.net/p/vice-emu/code/34328
Author: compyx
Date: 2018-01-17 15:22:38 +0000 (Wed, 17 Jan 2018)
Log Message:
-----------
Gtk3: Refactor and rename keyboard settings UI
Modified Paths:
--------------
trunk/vice/src/arch/gtk3/Makefile.am
trunk/vice/src/arch/gtk3/uisettings.c
trunk/vice/src/arch/gtk3/widgets/Makefile.am
trunk/vice/src/arch/gtk3/widgets/kbdlayoutwidget.c
trunk/vice/src/arch/gtk3/widgets/kbdlayoutwidget.h
trunk/vice/src/arch/gtk3/widgets/kbdmappingwidget.c
trunk/vice/src/arch/gtk3/widgets/kbdmappingwidget.h
Added Paths:
-----------
trunk/vice/src/arch/gtk3/widgets/settings_keyboard.c
trunk/vice/src/arch/gtk3/widgets/settings_keyboard.h
Removed Paths:
-------------
trunk/vice/src/arch/gtk3/uikeyboard.c
trunk/vice/src/arch/gtk3/uikeyboard.h
Modified: trunk/vice/src/arch/gtk3/Makefile.am
===================================================================
--- trunk/vice/src/arch/gtk3/Makefile.am 2018-01-17 14:54:32 UTC (rev 34327)
+++ trunk/vice/src/arch/gtk3/Makefile.am 2018-01-17 15:22:38 UTC (rev 34328)
@@ -74,7 +74,6 @@
uimenu.c \
uimon.c \
uimon-fallback.c \
- uikeyboard.c \
uisettings.c \
uismartattach.c \
uistatusbar.c \
@@ -138,7 +137,6 @@
uidatasette.h \
uidiskattach.h \
uifliplist.h \
- uikeyboard.h \
uiedit.h \
uimachinemenu.h \
uimachinewindow.h \
Deleted: trunk/vice/src/arch/gtk3/uikeyboard.c
===================================================================
--- trunk/vice/src/arch/gtk3/uikeyboard.c 2018-01-17 14:54:32 UTC (rev 34327)
+++ trunk/vice/src/arch/gtk3/uikeyboard.c 2018-01-17 15:22:38 UTC (rev 34328)
@@ -1,67 +0,0 @@
-/*
- * uikeyboard.c - GTK3 keyboard settings central widget for the settings dialog
- *
- * Written by
- * Bas Wassink <b.w...@zi...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- */
-
-
-#include "vice.h"
-
-#include <gtk/gtk.h>
-
-#include "lib.h"
-#include "ui.h"
-#include "resources.h"
-#include "vsync.h"
-#include "widgethelpers.h"
-
-#include "kbdmappingwidget.h"
-#include "kbdlayoutwidget.h"
-
-#include "uikeyboard.h"
-
-
-
-/** \brief Create keyboard settings widget
- *
- * \param[in] widget parent widget
- *
- * \return GtkGrid
- */
-GtkWidget *uikeyboard_create_central_widget(GtkWidget *widget)
-{
- GtkWidget *layout;
- GtkWidget *mapping_widget;
- GtkWidget *layout_widget;
-
- layout = gtk_grid_new();
-
- mapping_widget = kbdmapping_widget_create(widget);
- gtk_grid_attach(GTK_GRID(layout), mapping_widget, 0, 0, 1, 1);
-
- layout_widget = kbdlayout_widget_create();
-
- gtk_grid_attach(GTK_GRID(layout), layout_widget, 0, 1, 1, 1);
-
- gtk_widget_show_all(layout);
- return layout;
-}
Deleted: trunk/vice/src/arch/gtk3/uikeyboard.h
===================================================================
--- trunk/vice/src/arch/gtk3/uikeyboard.h 2018-01-17 14:54:32 UTC (rev 34327)
+++ trunk/vice/src/arch/gtk3/uikeyboard.h 2018-01-17 15:22:38 UTC (rev 34328)
@@ -1,34 +0,0 @@
-/** \file src/arch/gtk3/uikeyboard.h
- * \brief Keyboard settings main widget - header
- *
- * Written by
- * Bas Wassink <b.w...@zi...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- */
-
-#ifndef VICE_UIKEYBOARD_H
-#define VICE_UIKEYBOARD_H
-
-#include "vice.h"
-#include <gtk/gtk.h>
-
-GtkWidget *uikeyboard_create_central_widget(GtkWidget *widget);
-
-#endif
Modified: trunk/vice/src/arch/gtk3/uisettings.c
===================================================================
--- trunk/vice/src/arch/gtk3/uisettings.c 2018-01-17 14:54:32 UTC (rev 34327)
+++ trunk/vice/src/arch/gtk3/uisettings.c 2018-01-17 15:22:38 UTC (rev 34328)
@@ -65,7 +65,7 @@
#include "ui.h"
#include "settings_speed.h"
-#include "uikeyboard.h"
+#include "settings_keyboard.h"
#include "settings_sound.h"
#include "settings_autostart.h"
#include "uidrivesettings.h"
@@ -656,7 +656,7 @@
settings_speed_widget_create, NULL },
{ "Keyboard settings",
"keyboard",
- uikeyboard_create_central_widget, NULL },
+ settings_keyboard_widget_create, NULL },
{ "Sound settings",
"sound",
settings_sound_create, NULL },
Modified: trunk/vice/src/arch/gtk3/widgets/Makefile.am
===================================================================
--- trunk/vice/src/arch/gtk3/widgets/Makefile.am 2018-01-17 14:54:32 UTC (rev 34327)
+++ trunk/vice/src/arch/gtk3/widgets/Makefile.am 2018-01-17 15:22:38 UTC (rev 34328)
@@ -140,7 +140,8 @@
settings_sound.c \
settings_video.c \
settings_autostart.c \
- settings_speed.c
+ settings_speed.c \
+ settings_keyboard.c
EXTRA_DIST = \
jamdialog.h \
@@ -258,4 +259,5 @@
settings_sound.h \
settings_video.h \
settings_autostart.h \
- settings_speed.h
+ settings_speed.h \
+ settings_keyboard.h
Modified: trunk/vice/src/arch/gtk3/widgets/kbdlayoutwidget.c
===================================================================
--- trunk/vice/src/arch/gtk3/widgets/kbdlayoutwidget.c 2018-01-17 14:54:32 UTC (rev 34327)
+++ trunk/vice/src/arch/gtk3/widgets/kbdlayoutwidget.c 2018-01-17 15:22:38 UTC (rev 34328)
@@ -1,5 +1,5 @@
-/*
- * kbdlayoutwidget.c - GTK3 keyboard layout widget for the settings dialog
+/** \file src/arch/gtk3/widgets/kbdlayoutwidget.c
+ * \brief GTK3 keyboard layout widget for the settings dialog
*
* Written by
* Bas Wassink <b.w...@zi...>
@@ -71,7 +71,7 @@
GtkWidget *group;
grid = vice_gtk3_grid_new_spaced_with_label(
- VICE_GTK3_DEFAULT, VICE_GTK3_DEFAULT, "Render filter", 1);
+ VICE_GTK3_DEFAULT, VICE_GTK3_DEFAULT, "Keyboard layout", 1);
group = vice_gtk3_resource_radiogroup_create(
"KeyboardMapping", kbd_layouts, GTK_ORIENTATION_VERTICAL);
g_object_set(group, "margin-left", 16, NULL);
@@ -79,5 +79,3 @@
gtk_widget_show_all(grid);
return grid;
}
-
-
Modified: trunk/vice/src/arch/gtk3/widgets/kbdlayoutwidget.h
===================================================================
--- trunk/vice/src/arch/gtk3/widgets/kbdlayoutwidget.h 2018-01-17 14:54:32 UTC (rev 34327)
+++ trunk/vice/src/arch/gtk3/widgets/kbdlayoutwidget.h 2018-01-17 15:22:38 UTC (rev 34328)
@@ -1,5 +1,5 @@
/** \file src/arch/gtk3/kbdlayoutwidget.h
- * \brief Keyboard layout widget for the settings dialog - header
+ * \brief Gtk3 keyboard layout widget for the settings dialog - header
*
* Written by
* Bas Wassink <b.w...@zi...>
Modified: trunk/vice/src/arch/gtk3/widgets/kbdmappingwidget.c
===================================================================
--- trunk/vice/src/arch/gtk3/widgets/kbdmappingwidget.c 2018-01-17 14:54:32 UTC (rev 34327)
+++ trunk/vice/src/arch/gtk3/widgets/kbdmappingwidget.c 2018-01-17 15:22:38 UTC (rev 34328)
@@ -1,5 +1,5 @@
-/*
- * kbdmappingwidget.c - GTK3 keyboard mapping widget for the settings dialog
+/** \file src/arch/gtk3/widgets/kbdmappingwidget.c
+ * \brief GTK3 keyboard mapping widget for the settings dialog
*
* Written by
* Bas Wassink <b.w...@zi...>
Modified: trunk/vice/src/arch/gtk3/widgets/kbdmappingwidget.h
===================================================================
--- trunk/vice/src/arch/gtk3/widgets/kbdmappingwidget.h 2018-01-17 14:54:32 UTC (rev 34327)
+++ trunk/vice/src/arch/gtk3/widgets/kbdmappingwidget.h 2018-01-17 15:22:38 UTC (rev 34328)
@@ -1,5 +1,5 @@
/** \file src/arch/gtk3/widgets/kbdmappingwidget.h
- * \brief Keyboard mapping widget for the settings dialog - header
+ * \brief Gtk3 keyboard mapping widget for the settings dialog - header
*
* Written by
* Bas Wassink <b.w...@zi...>
Copied: trunk/vice/src/arch/gtk3/widgets/settings_keyboard.c (from rev 34327, trunk/vice/src/arch/gtk3/uikeyboard.c)
===================================================================
--- trunk/vice/src/arch/gtk3/widgets/settings_keyboard.c (rev 0)
+++ trunk/vice/src/arch/gtk3/widgets/settings_keyboard.c 2018-01-17 15:22:38 UTC (rev 34328)
@@ -0,0 +1,68 @@
+/** \file src/arch/gtk3/widgets/settings_keyboard.c
+ * \brief GTK3 keyboard settings main widget
+ *
+ * Written by
+ * Bas Wassink <b.w...@zi...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ */
+
+
+#include "vice.h"
+
+#include <gtk/gtk.h>
+
+#include "lib.h"
+#include "ui.h"
+#include "resources.h"
+#include "vsync.h"
+#include "basewidgets.h"
+#include "widgethelpers.h"
+
+#include "kbdmappingwidget.h"
+#include "kbdlayoutwidget.h"
+
+#include "settings_keyboard.h"
+
+
+
+/** \brief Create keyboard settings widget
+ *
+ * \param[in] widget parent widget
+ *
+ * \return GtkGrid
+ */
+GtkWidget *settings_keyboard_widget_create(GtkWidget *widget)
+{
+ GtkWidget *layout;
+ GtkWidget *mapping_widget;
+ GtkWidget *layout_widget;
+
+ layout = vice_gtk3_grid_new_spaced(VICE_GTK3_DEFAULT, VICE_GTK3_DEFAULT);
+
+ mapping_widget = kbdmapping_widget_create(widget);
+ gtk_grid_attach(GTK_GRID(layout), mapping_widget, 0, 0, 1, 1);
+
+ layout_widget = kbdlayout_widget_create();
+
+ gtk_grid_attach(GTK_GRID(layout), layout_widget, 0, 1, 1, 1);
+
+ gtk_widget_show_all(layout);
+ return layout;
+}
Copied: trunk/vice/src/arch/gtk3/widgets/settings_keyboard.h (from rev 34327, trunk/vice/src/arch/gtk3/uikeyboard.h)
===================================================================
--- trunk/vice/src/arch/gtk3/widgets/settings_keyboard.h (rev 0)
+++ trunk/vice/src/arch/gtk3/widgets/settings_keyboard.h 2018-01-17 15:22:38 UTC (rev 34328)
@@ -0,0 +1,34 @@
+/** \file src/arch/gtk3/widgets/settings_keyboard.h
+ * \brief Gtk3 keyboard settings main widget - header
+ *
+ * Written by
+ * Bas Wassink <b.w...@zi...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ */
+
+#ifndef VICE_SETTINGS_KEYBOARD_H
+#define VICE_SETTINGS_KEYBOARD_H
+
+#include "vice.h"
+#include <gtk/gtk.h>
+
+GtkWidget *settings_keyboard_widget_create(GtkWidget *widget);
+
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|