mirror of
https://github.com/ZoiteChat/zoitechat.git
synced 2026-03-22 21:40:19 +00:00
Compare commits
4 Commits
zoitechat-
...
windows-fo
| Author | SHA1 | Date | |
|---|---|---|---|
| bb95502dd6 | |||
| 4f1edef667 | |||
| 4d140fc051 | |||
| 64dcee10eb |
@@ -1,28 +1,6 @@
|
||||
ZoiteChat ChangeLog
|
||||
=================
|
||||
|
||||
2.18.0~pre5 (2026-03-22)
|
||||
------------------------
|
||||
- Overhauled preferences/config saving: fully staged and transactional, debounced
|
||||
with flush on close, write failures now surfaced.
|
||||
- Overhauled GTK theme handling: live preview, correct colour reset persistence,
|
||||
proper file:// import paths, consistent menubar CSS.
|
||||
- Fixed GTK entry scroll artifact in the input box.
|
||||
- Hardened tray menu lifetime; fixed stale pointer crash on menu destruction.
|
||||
- Fixed AppIndicator tray init for Wayland/source builds; skip redundant X11
|
||||
tray probe for AppIndicator builds.
|
||||
- Split topic/mode rows in channel bar, tighten spacing, persist userlist column widths.
|
||||
- Preserve saved right-pane size on first layout.
|
||||
- Fixed sounds prefs section.
|
||||
- Fixed chanview tree layout and header alignment; tighten topic URL hit-testing.
|
||||
- Dropped realpath() in favour of GLib-only absolute path build.
|
||||
- Made About dialog links explicit; added GPL licence URL.
|
||||
- Added licence headers to new source files.
|
||||
- Windows installer: fixed VC++ redist URL, added non-plugin download fallback,
|
||||
switched to registry-based runtime detection.
|
||||
- Made libayatana-appindicator a required dep in PKGBUILD.
|
||||
- Cleaned up Meson libperl detection.
|
||||
|
||||
2.18.0~pre4 (2026-03-15)
|
||||
------------------------
|
||||
|
||||
|
||||
@@ -29,45 +29,6 @@
|
||||
<id>zoitechat.desktop</id>
|
||||
</provides>
|
||||
<releases>
|
||||
<release date="2026-03-22" version="2.18.0~pre5">
|
||||
<description>
|
||||
<p>Preferences and config saving:</p>
|
||||
<ul>
|
||||
<li>Overhauled preferences/config saving: fully staged and transactional, debounced with flush on close, write failures now surfaced.</li>
|
||||
</ul>
|
||||
<p>GTK theme and UI:</p>
|
||||
<ul>
|
||||
<li>Overhauled GTK theme handling: live preview, correct colour reset persistence, proper <code>file://</code> import paths, consistent menubar CSS.</li>
|
||||
<li>Fixed GTK entry scroll artifact in the input box.</li>
|
||||
<li>Split topic/mode rows in channel bar, tighten spacing, persist userlist column widths.</li>
|
||||
<li>Preserve saved right-pane size on first layout.</li>
|
||||
<li>Fixed sounds prefs section.</li>
|
||||
<li>Fixed chanview tree layout and header alignment; tighten topic URL hit-testing.</li>
|
||||
</ul>
|
||||
<p>Tray:</p>
|
||||
<ul>
|
||||
<li>Hardened tray menu lifetime; fixed stale pointer crash on menu destruction.</li>
|
||||
<li>Fixed AppIndicator tray init for Wayland/source builds; skip redundant X11 tray probe for AppIndicator builds.</li>
|
||||
</ul>
|
||||
<p>Build and packaging:</p>
|
||||
<ul>
|
||||
<li>Dropped <code>realpath()</code> in favour of GLib-only absolute path build.</li>
|
||||
<li>Made About dialog links explicit; added GPL licence URL.</li>
|
||||
<li>Added licence headers to new source files.</li>
|
||||
<li>Windows installer: fixed VC++ redist URL, added non-plugin download fallback, switched to registry-based runtime detection.</li>
|
||||
<li>Made <code>libayatana-appindicator</code> a required dep in PKGBUILD.</li>
|
||||
<li>Cleaned up Meson libperl detection.</li>
|
||||
</ul>
|
||||
</description>
|
||||
</release>
|
||||
<release date="2026-03-22" version="2.18.0~pre5">
|
||||
<description>
|
||||
<p>Version metadata update:</p>
|
||||
<ul>
|
||||
<li>Bumped release version references to <code>2.18.0~pre5</code> across build and packaging files.</li>
|
||||
</ul>
|
||||
</description>
|
||||
</release>
|
||||
<release date="2026-03-14" version="2.18.0~pre4">
|
||||
<description>
|
||||
<p>UI fixes, topic bar improvements, and selection styling updates:</p>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
project('zoitechat', 'c',
|
||||
version: '2.18.0~pre5',
|
||||
version: '2.18.0~pre4',
|
||||
meson_version: '>= 0.55.0',
|
||||
default_options: [
|
||||
'c_std=c17',
|
||||
|
||||
@@ -19,7 +19,7 @@ else:
|
||||
if not hasattr(sys, 'argv'):
|
||||
sys.argv = ['<zoitechat>']
|
||||
|
||||
VERSION = b'2.18.0~pre5'
|
||||
VERSION = b'2.18.0~pre4'
|
||||
PLUGIN_NAME = ffi.new('char[]', b'Python')
|
||||
PLUGIN_DESC = ffi.new('char[]', b'Python %d.%d scripting interface' % (sys.version_info[0], sys.version_info[1]))
|
||||
PLUGIN_VERSION = ffi.new('char[]', VERSION)
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include "gtk3-theme-service.h"
|
||||
|
||||
#ifndef G_OS_WIN32
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#ifndef ZOITECHAT_GTK3_THEME_SERVICE_H
|
||||
#define ZOITECHAT_GTK3_THEME_SERVICE_H
|
||||
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include "../zoitechat.h"
|
||||
#include "../gtk3-theme-service.h"
|
||||
#include "../cfgfiles.h"
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include <errno.h>
|
||||
|
||||
#include "zoitechat.h"
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#ifndef ZOITECHAT_THEME_SERVICE_H
|
||||
#define ZOITECHAT_THEME_SERVICE_H
|
||||
|
||||
|
||||
@@ -74,11 +74,15 @@ chanlistrow;
|
||||
|
||||
#define GET_MODEL(xserv) (gtk_tree_view_get_model(GTK_TREE_VIEW(xserv->gui->chanlist_list)))
|
||||
|
||||
#define CHANLIST_COL_WIDTH_MIN_CHANNEL 60
|
||||
#define CHANLIST_COL_WIDTH_MIN_USERS 40
|
||||
#define CHANLIST_COL_WIDTH_MIN_TOPIC 60
|
||||
|
||||
static int
|
||||
chanlist_normalize_width (int width)
|
||||
chanlist_clamp_width (int width, int min_width)
|
||||
{
|
||||
if (width < 1)
|
||||
return 1;
|
||||
if (width < min_width)
|
||||
return min_width;
|
||||
|
||||
return width;
|
||||
}
|
||||
@@ -819,17 +823,17 @@ chanlist_destroy_widget (GtkWidget *wid, server *serv)
|
||||
column = gtk_tree_view_get_column (GTK_TREE_VIEW (serv->gui->chanlist_list), COL_CHANNEL);
|
||||
if (column)
|
||||
prefs.hex_gui_chanlist_width_channel =
|
||||
chanlist_normalize_width (gtk_tree_view_column_get_width (column));
|
||||
chanlist_clamp_width (gtk_tree_view_column_get_width (column), CHANLIST_COL_WIDTH_MIN_CHANNEL);
|
||||
|
||||
column = gtk_tree_view_get_column (GTK_TREE_VIEW (serv->gui->chanlist_list), COL_USERS);
|
||||
if (column)
|
||||
prefs.hex_gui_chanlist_width_users =
|
||||
chanlist_normalize_width (gtk_tree_view_column_get_width (column));
|
||||
chanlist_clamp_width (gtk_tree_view_column_get_width (column), CHANLIST_COL_WIDTH_MIN_USERS);
|
||||
|
||||
column = gtk_tree_view_get_column (GTK_TREE_VIEW (serv->gui->chanlist_list), COL_TOPIC);
|
||||
if (column)
|
||||
prefs.hex_gui_chanlist_width_topic =
|
||||
chanlist_normalize_width (gtk_tree_view_column_get_width (column));
|
||||
chanlist_clamp_width (gtk_tree_view_column_get_width (column), CHANLIST_COL_WIDTH_MIN_TOPIC);
|
||||
|
||||
if (!save_config ())
|
||||
fe_message (_("Could not save zoitechat.conf."), FE_MSG_WARN);
|
||||
@@ -979,7 +983,7 @@ chanlist_opengui (server *serv, int do_refresh)
|
||||
GtkTreeViewColumn *column = gtk_tree_view_get_column (GTK_TREE_VIEW (view), COL_CHANNEL);
|
||||
if (column)
|
||||
gtk_tree_view_column_set_fixed_width (column,
|
||||
chanlist_normalize_width (prefs.hex_gui_chanlist_width_channel));
|
||||
chanlist_clamp_width (prefs.hex_gui_chanlist_width_channel, CHANLIST_COL_WIDTH_MIN_CHANNEL));
|
||||
}
|
||||
|
||||
if (prefs.hex_gui_chanlist_width_users > 0)
|
||||
@@ -989,7 +993,7 @@ chanlist_opengui (server *serv, int do_refresh)
|
||||
{
|
||||
gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
|
||||
gtk_tree_view_column_set_fixed_width (column,
|
||||
chanlist_normalize_width (prefs.hex_gui_chanlist_width_users));
|
||||
chanlist_clamp_width (prefs.hex_gui_chanlist_width_users, CHANLIST_COL_WIDTH_MIN_USERS));
|
||||
gtk_tree_view_column_set_resizable (column, FALSE);
|
||||
}
|
||||
}
|
||||
@@ -1001,7 +1005,7 @@ chanlist_opengui (server *serv, int do_refresh)
|
||||
{
|
||||
gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
|
||||
gtk_tree_view_column_set_fixed_width (column,
|
||||
chanlist_normalize_width (prefs.hex_gui_chanlist_width_topic));
|
||||
chanlist_clamp_width (prefs.hex_gui_chanlist_width_topic, CHANLIST_COL_WIDTH_MIN_TOPIC));
|
||||
}
|
||||
}
|
||||
gtk_tree_view_set_grid_lines (GTK_TREE_VIEW (view), GTK_TREE_VIEW_GRID_LINES_HORIZONTAL);
|
||||
|
||||
@@ -1120,9 +1120,7 @@ gtkutil_treeview_get_selected (GtkTreeView *view, GtkTreeIter *iter_ret, ...)
|
||||
gboolean
|
||||
gtkutil_tray_icon_supported (GtkWindow *window)
|
||||
{
|
||||
#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_APPINDICATOR)
|
||||
return TRUE;
|
||||
#elif defined(GDK_WINDOWING_X11)
|
||||
#ifdef GDK_WINDOWING_X11
|
||||
GdkScreen *screen = gtk_window_get_screen (window);
|
||||
GdkDisplay *display = gdk_screen_get_display (screen);
|
||||
if (!GDK_IS_X11_DISPLAY (display))
|
||||
|
||||
@@ -461,6 +461,8 @@ static void mg_create_entry (session *sess, GtkWidget *box);
|
||||
static void mg_create_search (session *sess, GtkWidget *box);
|
||||
#ifdef G_OS_WIN32
|
||||
static GdkFilterReturn mg_win32_filter (GdkXEvent *xevent, GdkEvent *event, gpointer data);
|
||||
static void mg_show_win32_emoji_panel (GtkEntry *entry);
|
||||
static void mg_inputbox_icon_press (GtkEntry *entry, GtkEntryIconPosition icon_pos, GdkEvent *event, gpointer user_data);
|
||||
#endif
|
||||
static void mg_link_irctab (session *sess, int focus);
|
||||
|
||||
@@ -2803,43 +2805,6 @@ mg_apply_entry_style (GtkWidget *entry)
|
||||
theme_manager_apply_entry_palette (entry, input_style->font_desc);
|
||||
}
|
||||
|
||||
static void
|
||||
mg_apply_entry_scroll_artifact_fix (GtkWidget *entry)
|
||||
{
|
||||
GtkStyleContext *context;
|
||||
GtkCssProvider *provider;
|
||||
|
||||
if (!entry || !GTK_IS_ENTRY (entry))
|
||||
return;
|
||||
|
||||
context = gtk_widget_get_style_context (entry);
|
||||
if (!context)
|
||||
return;
|
||||
|
||||
provider = g_object_get_data (G_OBJECT (entry), "mg-entry-scroll-artifact-provider");
|
||||
if (!provider)
|
||||
{
|
||||
provider = gtk_css_provider_new ();
|
||||
g_object_set_data_full (G_OBJECT (entry), "mg-entry-scroll-artifact-provider", provider, g_object_unref);
|
||||
gtk_css_provider_load_from_data (provider,
|
||||
"entry.zoitechat-no-undershoot undershoot,\n"
|
||||
"entry.zoitechat-no-undershoot undershoot.left,\n"
|
||||
"entry.zoitechat-no-undershoot undershoot.right,\n"
|
||||
".zoitechat-no-undershoot undershoot,\n"
|
||||
".zoitechat-no-undershoot undershoot.left,\n"
|
||||
".zoitechat-no-undershoot undershoot.right {\n"
|
||||
" background-image: none;\n"
|
||||
" background-color: transparent;\n"
|
||||
" border: none;\n"
|
||||
" box-shadow: none;\n"
|
||||
"}\n",
|
||||
-1, NULL);
|
||||
}
|
||||
|
||||
gtk_style_context_add_class (context, "zoitechat-no-undershoot");
|
||||
theme_css_apply_widget_provider (entry, GTK_STYLE_PROVIDER (provider));
|
||||
}
|
||||
|
||||
static gboolean
|
||||
mg_entry_select_all (GtkWidget *entry, GdkEventKey *event, gpointer userdata)
|
||||
{
|
||||
@@ -2879,7 +2844,6 @@ mg_create_chanmodebuttons (session_gui *gui, GtkWidget *box)
|
||||
|
||||
if (prefs.hex_gui_input_style)
|
||||
mg_apply_entry_style (gui->key_entry);
|
||||
mg_apply_entry_scroll_artifact_fix (gui->key_entry);
|
||||
|
||||
gui->flag_l = mg_create_flagbutton (_("User Limit"), box, "l");
|
||||
gui->limit_entry = gtk_entry_new ();
|
||||
@@ -2896,7 +2860,6 @@ mg_create_chanmodebuttons (session_gui *gui, GtkWidget *box)
|
||||
|
||||
if (prefs.hex_gui_input_style)
|
||||
mg_apply_entry_style (gui->limit_entry);
|
||||
mg_apply_entry_scroll_artifact_fix (gui->limit_entry);
|
||||
}
|
||||
|
||||
/*static void
|
||||
@@ -3415,23 +3378,6 @@ mg_rightpane_cb (GtkPaned *pane, GParamSpec *param, session_gui *gui)
|
||||
prefs.hex_gui_pane_right_size = allocation.width - gtk_paned_get_position (pane) - handle_size;
|
||||
}
|
||||
|
||||
static void
|
||||
mg_restore_rightpane_cb (GtkWidget *widget, GtkAllocation *allocation, gpointer data)
|
||||
{
|
||||
int handle_size;
|
||||
int saved_size;
|
||||
/* only restore once, then disconnect */
|
||||
g_signal_handlers_disconnect_by_func (widget, mg_restore_rightpane_cb, data);
|
||||
/* use the value captured at connect time, since notify::position may
|
||||
* have already overwritten prefs.hex_gui_pane_right_size during the
|
||||
* initial layout pass */
|
||||
saved_size = GPOINTER_TO_INT (data);
|
||||
if (saved_size < 1)
|
||||
return;
|
||||
gtk_widget_style_get (widget, "handle-size", &handle_size, NULL);
|
||||
gtk_paned_set_position (GTK_PANED (widget), allocation->width - saved_size - handle_size);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
mg_add_pane_signals (session_gui *gui)
|
||||
{
|
||||
@@ -3465,13 +3411,6 @@ mg_create_center (session *sess, session_gui *gui, GtkWidget *box)
|
||||
/* sep between xtext and right side */
|
||||
gui->hpane_right = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
|
||||
|
||||
/* restore right pane position after first allocation (needs widget width).
|
||||
* capture the saved size now because notify::position will overwrite the
|
||||
* pref during the initial layout before size-allocate fires. */
|
||||
g_signal_connect (gui->hpane_right, "size-allocate",
|
||||
G_CALLBACK (mg_restore_rightpane_cb),
|
||||
GINT_TO_POINTER (prefs.hex_gui_pane_right_size));
|
||||
|
||||
if (prefs.hex_gui_win_swap)
|
||||
{
|
||||
gtk_paned_pack2 (GTK_PANED (gui->hpane_left), gui->vpane_left, FALSE, FALSE);
|
||||
@@ -3994,7 +3933,6 @@ mg_create_search(session *sess, GtkWidget *box)
|
||||
gtk_box_pack_start(GTK_BOX(gui->shbox), entry, FALSE, FALSE, 0);
|
||||
gtk_widget_set_size_request (gui->shentry, 180, -1);
|
||||
mg_apply_emoji_fallback_widget (entry);
|
||||
mg_apply_entry_scroll_artifact_fix (entry);
|
||||
gui->search_changed_signal = g_signal_connect(G_OBJECT(entry), "changed", G_CALLBACK(search_handle_change), sess);
|
||||
g_signal_connect (G_OBJECT (entry), "key-press-event", G_CALLBACK (search_handle_esc), sess);
|
||||
g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(mg_search_handle_next), sess);
|
||||
@@ -4090,9 +4028,14 @@ mg_create_entry (session *sess, GtkWidget *box)
|
||||
|
||||
if (prefs.hex_gui_input_style)
|
||||
mg_apply_entry_style (entry);
|
||||
mg_apply_entry_scroll_artifact_fix (entry);
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
g_object_set (G_OBJECT (entry), "show-emoji-icon", FALSE, NULL);
|
||||
gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry), GTK_ENTRY_ICON_PRIMARY, NULL);
|
||||
g_signal_connect (G_OBJECT (entry), "icon-press", G_CALLBACK (mg_inputbox_icon_press), NULL);
|
||||
#else
|
||||
g_object_set (G_OBJECT (entry), "show-emoji-icon", TRUE, NULL);
|
||||
#endif
|
||||
|
||||
if (gtk_entry_get_icon_storage_type (GTK_ENTRY (entry), GTK_ENTRY_ICON_SECONDARY) == GTK_IMAGE_EMPTY)
|
||||
{
|
||||
@@ -4102,6 +4045,59 @@ mg_create_entry (session *sess, GtkWidget *box)
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
static void
|
||||
mg_show_win32_emoji_panel (GtkEntry *entry)
|
||||
{
|
||||
INPUT input[4];
|
||||
GdkRectangle icon_rect;
|
||||
GtkWidget *widget;
|
||||
GdkWindow *window;
|
||||
gint origin_x, origin_y;
|
||||
|
||||
widget = GTK_WIDGET (entry);
|
||||
if (gtk_widget_get_realized (widget))
|
||||
{
|
||||
window = gtk_widget_get_window (widget);
|
||||
if (window)
|
||||
{
|
||||
gtk_entry_get_icon_area (entry, GTK_ENTRY_ICON_SECONDARY, &icon_rect);
|
||||
gdk_window_get_origin (window, &origin_x, &origin_y);
|
||||
SetCursorPos (origin_x + icon_rect.x + (icon_rect.width / 2),
|
||||
origin_y + icon_rect.y + (icon_rect.height / 2));
|
||||
}
|
||||
}
|
||||
|
||||
ZeroMemory (input, sizeof (input));
|
||||
|
||||
input[0].type = INPUT_KEYBOARD;
|
||||
input[0].ki.wVk = VK_LWIN;
|
||||
input[1].type = INPUT_KEYBOARD;
|
||||
input[1].ki.wVk = VK_OEM_PERIOD;
|
||||
input[2].type = INPUT_KEYBOARD;
|
||||
input[2].ki.wVk = VK_OEM_PERIOD;
|
||||
input[2].ki.dwFlags = KEYEVENTF_KEYUP;
|
||||
input[3].type = INPUT_KEYBOARD;
|
||||
input[3].ki.wVk = VK_LWIN;
|
||||
input[3].ki.dwFlags = KEYEVENTF_KEYUP;
|
||||
|
||||
SendInput ((UINT) G_N_ELEMENTS (input), input, sizeof (INPUT));
|
||||
}
|
||||
|
||||
static void
|
||||
mg_inputbox_icon_press (GtkEntry *entry, GtkEntryIconPosition icon_pos, GdkEvent *event, gpointer user_data)
|
||||
{
|
||||
(void) event;
|
||||
(void) user_data;
|
||||
|
||||
if (icon_pos != GTK_ENTRY_ICON_SECONDARY)
|
||||
return;
|
||||
|
||||
g_signal_stop_emission_by_name (entry, "icon-press");
|
||||
mg_show_win32_emoji_panel (entry);
|
||||
}
|
||||
#endif
|
||||
|
||||
static void
|
||||
mg_switch_tab_cb (chanview *cv, chan *ch, int tag, gpointer ud)
|
||||
{
|
||||
|
||||
@@ -1879,21 +1879,6 @@ about_dialog_openurl (GtkAboutDialog *dialog, char *uri, gpointer data)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
about_dialog_add_links (GtkAboutDialog *dialog)
|
||||
{
|
||||
GtkWidget *content = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
|
||||
GtkWidget *row = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
|
||||
GtkWidget *website = gtk_link_button_new_with_label ("http://zoitechat.zoite.net", "Website");
|
||||
GtkWidget *license = gtk_link_button_new_with_label ("https://www.gnu.org/licenses/old-licenses/gpl-2.0.html", "License");
|
||||
gtk_button_set_relief (GTK_BUTTON (website), GTK_RELIEF_NONE);
|
||||
gtk_button_set_relief (GTK_BUTTON (license), GTK_RELIEF_NONE);
|
||||
gtk_box_pack_start (GTK_BOX (row), website, FALSE, FALSE, 0);
|
||||
gtk_box_pack_start (GTK_BOX (row), license, FALSE, FALSE, 0);
|
||||
gtk_box_pack_start (GTK_BOX (content), row, FALSE, FALSE, 0);
|
||||
gtk_widget_show_all (row);
|
||||
}
|
||||
|
||||
static void
|
||||
menu_about (GtkWidget *wid, gpointer sess)
|
||||
{
|
||||
@@ -1914,14 +1899,12 @@ menu_about (GtkWidget *wid, gpointer sess)
|
||||
|
||||
gtk_about_dialog_set_program_name (dialog, _(DISPLAY_NAME));
|
||||
gtk_about_dialog_set_version (dialog, PACKAGE_VERSION);
|
||||
gtk_about_dialog_set_authors (dialog, NULL);
|
||||
gtk_about_dialog_set_documenters (dialog, NULL);
|
||||
gtk_about_dialog_set_artists (dialog, NULL);
|
||||
gtk_about_dialog_set_translator_credits (dialog, NULL);
|
||||
gtk_about_dialog_set_license_type (GTK_ABOUT_DIALOG (dialog), GTK_LICENSE_GPL_2_0);
|
||||
gtk_about_dialog_set_website (dialog, "http://zoitechat.zoite.net");
|
||||
gtk_about_dialog_set_website_label (dialog, "Website");
|
||||
gtk_about_dialog_set_logo (dialog, pix_zoitechat);
|
||||
gtk_about_dialog_set_copyright (dialog, "\302\251 1998-2010 Peter \305\275elezn\303\275\n\302\251 2009-2014 Berke Viktor\n\302\251 2026 deepend");
|
||||
gtk_about_dialog_set_comments (dialog, comment);
|
||||
about_dialog_add_links (dialog);
|
||||
|
||||
gtk_window_set_transient_for (GTK_WINDOW(dialog), GTK_WINDOW(parent_window));
|
||||
g_signal_connect (G_OBJECT(dialog), "response", G_CALLBACK(about_dialog_close), NULL);
|
||||
|
||||
@@ -65,8 +65,8 @@ if host_machine.system() != 'windows'
|
||||
if appindicator_dep.found()
|
||||
zoitechat_gtk_deps += appindicator_dep
|
||||
zoitechat_gtk_cflags += '-DHAVE_APPINDICATOR'
|
||||
elif appindicator_opt.enabled() or (appindicator_opt.auto() and host_machine.system() == 'linux')
|
||||
error('tray support requires ayatana-appindicator3-0.1 or appindicator3-0.1 on Linux (use -Dappindicator=disabled to override)')
|
||||
elif appindicator_opt.enabled()
|
||||
error('appindicator=enabled, but neither ayatana-appindicator3-0.1 nor appindicator3-0.1 was found')
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -125,7 +125,6 @@ static void tray_menu_notify_cb (GObject *tray, GParamSpec *pspec, gpointer user
|
||||
static void tray_update_toggle_item_label (void);
|
||||
static gboolean tray_window_state_cb (GtkWidget *widget, GdkEventWindowState *event, gpointer userdata);
|
||||
static void tray_window_visibility_cb (GtkWidget *widget, gpointer userdata);
|
||||
static void tray_toggle_item_destroy_cb (GtkWidget *widget, gpointer userdata);
|
||||
#if HAVE_APPINDICATOR_BACKEND
|
||||
static void tray_menu_show_cb (GtkWidget *menu, gpointer userdata) G_GNUC_UNUSED;
|
||||
#endif
|
||||
@@ -365,8 +364,8 @@ tray_app_indicator_set_icon (TrayIcon icon)
|
||||
if (!icon_name)
|
||||
return;
|
||||
|
||||
app_indicator_set_status (tray_indicator, APP_INDICATOR_STATUS_ACTIVE);
|
||||
app_indicator_set_icon_full (tray_indicator, icon_name, _(DISPLAY_NAME));
|
||||
app_indicator_set_status (tray_indicator, APP_INDICATOR_STATUS_ACTIVE);
|
||||
|
||||
g_free (icon_name_alloc);
|
||||
}
|
||||
@@ -409,8 +408,7 @@ tray_app_indicator_cleanup (void)
|
||||
|
||||
if (tray_menu)
|
||||
{
|
||||
if (GTK_IS_WIDGET (tray_menu))
|
||||
gtk_widget_destroy (tray_menu);
|
||||
gtk_widget_destroy (tray_menu);
|
||||
tray_menu = NULL;
|
||||
}
|
||||
}
|
||||
@@ -433,6 +431,7 @@ tray_app_indicator_init (void)
|
||||
g_signal_connect (G_OBJECT (tray_menu), "map",
|
||||
G_CALLBACK (tray_menu_show_cb), NULL);
|
||||
app_indicator_set_menu (tray_indicator, GTK_MENU (tray_menu));
|
||||
app_indicator_set_status (tray_indicator, APP_INDICATOR_STATUS_ACTIVE);
|
||||
|
||||
klass = G_OBJECT_GET_CLASS (tray_indicator);
|
||||
if (klass && g_object_class_find_property (klass, "connected"))
|
||||
@@ -1028,15 +1027,10 @@ blink_item (unsigned int *setting, GtkWidget *menu, char *label)
|
||||
static void
|
||||
tray_menu_destroy (GtkWidget *menu, gpointer userdata)
|
||||
{
|
||||
GtkWidget **menu_ptr = userdata;
|
||||
(void)userdata;
|
||||
|
||||
if (menu_ptr && *menu_ptr == menu)
|
||||
*menu_ptr = NULL;
|
||||
|
||||
if (GTK_IS_WIDGET (menu))
|
||||
gtk_widget_destroy (menu);
|
||||
if (G_IS_OBJECT (menu))
|
||||
g_object_unref (menu);
|
||||
gtk_widget_destroy (menu);
|
||||
g_object_unref (menu);
|
||||
#ifdef WIN32
|
||||
g_source_remove (tray_menu_timer);
|
||||
#endif
|
||||
@@ -1096,8 +1090,6 @@ tray_menu_populate (GtkWidget *menu)
|
||||
zoitechat_set_context (ph, zoitechat_find_context (ph, NULL, NULL));
|
||||
|
||||
tray_toggle_item = tray_make_item (menu, _("_Hide Window"), tray_menu_restore_cb, NULL);
|
||||
g_signal_connect (G_OBJECT (tray_toggle_item), "destroy",
|
||||
G_CALLBACK (tray_toggle_item_destroy_cb), NULL);
|
||||
tray_update_toggle_item_label ();
|
||||
tray_make_item (menu, NULL, tray_menu_quit_cb, NULL);
|
||||
|
||||
@@ -1138,22 +1130,12 @@ tray_menu_clear (GtkWidget *menu)
|
||||
|
||||
children = gtk_container_get_children (GTK_CONTAINER (menu));
|
||||
for (iter = children; iter; iter = iter->next)
|
||||
if (GTK_IS_WIDGET (iter->data))
|
||||
gtk_widget_destroy (GTK_WIDGET (iter->data));
|
||||
gtk_widget_destroy (GTK_WIDGET (iter->data));
|
||||
g_list_free (children);
|
||||
tray_toggle_item = NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
static void
|
||||
tray_toggle_item_destroy_cb (GtkWidget *widget, gpointer userdata)
|
||||
{
|
||||
(void)userdata;
|
||||
|
||||
if (tray_toggle_item == widget)
|
||||
tray_toggle_item = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
tray_update_toggle_item_label (void)
|
||||
{
|
||||
@@ -1161,11 +1143,6 @@ tray_update_toggle_item_label (void)
|
||||
|
||||
if (!tray_toggle_item)
|
||||
return;
|
||||
if (!GTK_IS_MENU_ITEM (tray_toggle_item))
|
||||
{
|
||||
tray_toggle_item = NULL;
|
||||
return;
|
||||
}
|
||||
|
||||
if (tray_get_window_status () == WS_HIDDEN)
|
||||
label = _("_Restore Window");
|
||||
@@ -1218,9 +1195,10 @@ tray_menu_cb (GtkWidget *widget, guint button, guint time, gpointer userdata)
|
||||
(void)time;
|
||||
(void)userdata;
|
||||
|
||||
if (menu)
|
||||
/* close any old menu */
|
||||
if (G_IS_OBJECT (menu))
|
||||
{
|
||||
tray_menu_destroy (menu, &menu);
|
||||
tray_menu_destroy (menu, NULL);
|
||||
}
|
||||
|
||||
menu = gtk_menu_new ();
|
||||
@@ -1230,9 +1208,8 @@ tray_menu_cb (GtkWidget *widget, guint button, guint time, gpointer userdata)
|
||||
g_object_ref (menu);
|
||||
g_object_ref_sink (menu);
|
||||
g_object_unref (menu);
|
||||
g_object_add_weak_pointer (G_OBJECT (menu), (gpointer *)&menu);
|
||||
g_signal_connect (G_OBJECT (menu), "selection-done",
|
||||
G_CALLBACK (tray_menu_destroy), &menu);
|
||||
G_CALLBACK (tray_menu_destroy), NULL);
|
||||
#ifdef WIN32
|
||||
g_signal_connect (G_OBJECT (menu), "leave-notify-event",
|
||||
G_CALLBACK (tray_menu_left_cb), NULL);
|
||||
@@ -1413,14 +1390,9 @@ tray_apply_setup (void)
|
||||
}
|
||||
else
|
||||
{
|
||||
#if HAVE_APPINDICATOR_BACKEND
|
||||
if (prefs.hex_gui_tray)
|
||||
tray_init ();
|
||||
#else
|
||||
GtkWindow *window = GTK_WINDOW(zoitechat_get_info (ph, "gtkwin_ptr"));
|
||||
if (prefs.hex_gui_tray && gtkutil_tray_icon_supported (window))
|
||||
tray_init ();
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1467,11 +1439,7 @@ tray_plugin_init (zoitechat_plugin *plugin_handle, char **plugin_name,
|
||||
G_CALLBACK (tray_window_visibility_cb), NULL);
|
||||
}
|
||||
|
||||
#if HAVE_APPINDICATOR_BACKEND
|
||||
if (prefs.hex_gui_tray)
|
||||
#else
|
||||
if (prefs.hex_gui_tray && gtkutil_tray_icon_supported (window))
|
||||
#endif
|
||||
tray_init ();
|
||||
|
||||
return 1; /* return 1 for success */
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include "preferences-persistence.h"
|
||||
|
||||
#include "../common/cfgfiles.h"
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#ifndef ZOITECHAT_PREFERENCES_PERSISTENCE_H
|
||||
#define ZOITECHAT_PREFERENCES_PERSISTENCE_H
|
||||
|
||||
|
||||
@@ -46,6 +46,8 @@
|
||||
|
||||
#ifdef WIN32
|
||||
#include "../common/fe.h"
|
||||
#include <windows.h>
|
||||
#include <commdlg.h>
|
||||
#endif
|
||||
#include "sexy-spell-entry.h"
|
||||
|
||||
@@ -88,6 +90,93 @@ typedef struct
|
||||
int extra;
|
||||
} setting;
|
||||
|
||||
#ifdef WIN32
|
||||
static gint
|
||||
setup_windows_point_tenths_from_height (LONG lf_height)
|
||||
{
|
||||
HDC screen_dc;
|
||||
gint dpi_y;
|
||||
|
||||
if (lf_height >= 0)
|
||||
return 90;
|
||||
|
||||
screen_dc = GetDC (NULL);
|
||||
dpi_y = screen_dc ? GetDeviceCaps (screen_dc, LOGPIXELSY) : 96;
|
||||
if (screen_dc)
|
||||
ReleaseDC (NULL, screen_dc);
|
||||
|
||||
return MulDiv (-lf_height, 720, dpi_y);
|
||||
}
|
||||
|
||||
static void
|
||||
setup_windows_get_default_log_font (LOGFONTW *log_font, gint *point_tenths)
|
||||
{
|
||||
NONCLIENTMETRICSW metrics;
|
||||
|
||||
memset (&metrics, 0, sizeof (metrics));
|
||||
metrics.cbSize = sizeof (metrics);
|
||||
if (SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, metrics.cbSize, &metrics, 0))
|
||||
{
|
||||
memcpy (log_font, &metrics.lfMessageFont, sizeof (*log_font));
|
||||
*point_tenths = setup_windows_point_tenths_from_height (log_font->lfHeight);
|
||||
}
|
||||
else
|
||||
{
|
||||
memset (log_font, 0, sizeof (*log_font));
|
||||
lstrcpyW (log_font->lfFaceName, L"Segoe UI");
|
||||
*point_tenths = 90;
|
||||
}
|
||||
}
|
||||
|
||||
static gboolean
|
||||
setup_windows_load_log_font_from_entry (GtkWidget *entry, LOGFONTW *log_font, gint *point_tenths)
|
||||
{
|
||||
const gchar *entry_text;
|
||||
PangoFontDescription *font_desc;
|
||||
const gchar *family;
|
||||
gunichar2 *family_utf16;
|
||||
gint pango_size;
|
||||
gint size_points;
|
||||
|
||||
entry_text = gtk_entry_get_text (GTK_ENTRY (entry));
|
||||
if (!entry_text || !entry_text[0])
|
||||
return FALSE;
|
||||
|
||||
font_desc = pango_font_description_from_string (entry_text);
|
||||
if (!font_desc)
|
||||
return FALSE;
|
||||
|
||||
family = pango_font_description_get_family (font_desc);
|
||||
if (!family || !family[0])
|
||||
{
|
||||
pango_font_description_free (font_desc);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
memset (log_font, 0, sizeof (*log_font));
|
||||
family_utf16 = g_utf8_to_utf16 (family, -1, NULL, NULL, NULL);
|
||||
if (!family_utf16)
|
||||
{
|
||||
pango_font_description_free (font_desc);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
lstrcpynW (log_font->lfFaceName, (LPCWSTR) family_utf16, LF_FACESIZE);
|
||||
g_free (family_utf16);
|
||||
|
||||
pango_size = pango_font_description_get_size (font_desc);
|
||||
size_points = pango_size > 0 ? pango_size / PANGO_SCALE : 0;
|
||||
*point_tenths = size_points > 0 ? size_points * 10 : 90;
|
||||
|
||||
log_font->lfItalic = pango_font_description_get_style (font_desc) != PANGO_STYLE_NORMAL ? TRUE : FALSE;
|
||||
log_font->lfWeight = pango_font_description_get_weight (font_desc);
|
||||
log_font->lfHeight = -MulDiv (*point_tenths, 96, 720);
|
||||
|
||||
pango_font_description_free (font_desc);
|
||||
return TRUE;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef WIN32
|
||||
static const char *const langsmenu[] =
|
||||
{
|
||||
@@ -1236,6 +1325,37 @@ setup_browsefolder_cb (GtkWidget *button, GtkEntry *entry)
|
||||
static void
|
||||
setup_browsefont_cb (GtkWidget *button, GtkWidget *entry)
|
||||
{
|
||||
#ifdef WIN32
|
||||
CHOOSEFONTW choose_font;
|
||||
LOGFONTW log_font;
|
||||
gunichar2 utf16_name[LF_FACESIZE];
|
||||
gchar *font_name;
|
||||
gchar font_spec[FONTNAMELEN + 1];
|
||||
gint point_size;
|
||||
gint point_tenths;
|
||||
|
||||
memset (&choose_font, 0, sizeof (choose_font));
|
||||
if (!setup_windows_load_log_font_from_entry (entry, &log_font, &point_tenths))
|
||||
setup_windows_get_default_log_font (&log_font, &point_tenths);
|
||||
|
||||
choose_font.lStructSize = sizeof (choose_font);
|
||||
choose_font.Flags = CF_SCREENFONTS | CF_FORCEFONTEXIST | CF_INITTOLOGFONTSTRUCT;
|
||||
choose_font.lpLogFont = &log_font;
|
||||
choose_font.iPointSize = point_tenths;
|
||||
|
||||
if (ChooseFontW (&choose_font))
|
||||
{
|
||||
memcpy (utf16_name, log_font.lfFaceName, sizeof (utf16_name));
|
||||
font_name = g_utf16_to_utf8 (utf16_name, -1, NULL, NULL, NULL);
|
||||
if (font_name && font_name[0])
|
||||
{
|
||||
point_size = choose_font.iPointSize > 0 ? choose_font.iPointSize / 10 : 11;
|
||||
g_snprintf (font_spec, sizeof (font_spec), "%s %d", font_name, point_size);
|
||||
gtk_entry_set_text (GTK_ENTRY (entry), font_spec);
|
||||
}
|
||||
g_free (font_name);
|
||||
}
|
||||
#else
|
||||
GtkWidget *dialog;
|
||||
const char *font_name;
|
||||
|
||||
@@ -1253,6 +1373,7 @@ setup_browsefont_cb (GtkWidget *button, GtkWidget *entry)
|
||||
G_CALLBACK (setup_fontchooser_response), entry);
|
||||
|
||||
gtk_widget_show (dialog);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -1714,11 +1835,11 @@ setup_create_sound_page (void)
|
||||
|
||||
vbox2 = gtkutil_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
|
||||
gtk_widget_show (vbox2);
|
||||
gtk_box_pack_start (GTK_BOX (vbox1), vbox2, TRUE, TRUE, 0);
|
||||
gtk_container_add (GTK_CONTAINER (vbox1), vbox2);
|
||||
|
||||
scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
|
||||
gtk_widget_show (scrolledwindow1);
|
||||
gtk_box_pack_start (GTK_BOX (vbox2), scrolledwindow1, TRUE, TRUE, 0);
|
||||
gtk_container_add (GTK_CONTAINER (vbox2), scrolledwindow1);
|
||||
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1),
|
||||
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
|
||||
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow1),
|
||||
@@ -1793,7 +1914,7 @@ setup_add_page (const char *title, GtkWidget *book, GtkWidget *tab)
|
||||
gtk_widget_set_margin_bottom (label, 1);
|
||||
gtk_box_pack_start (GTK_BOX (vvbox), label, FALSE, FALSE, 2);
|
||||
|
||||
gtk_box_pack_start (GTK_BOX (vvbox), tab, TRUE, TRUE, 0);
|
||||
gtk_container_add (GTK_CONTAINER (vvbox), tab);
|
||||
|
||||
sw = GTK_SCROLLED_WINDOW(gtk_scrolled_window_new (NULL, NULL));
|
||||
gtk_scrolled_window_set_shadow_type (sw, GTK_SHADOW_IN);
|
||||
@@ -2197,8 +2318,8 @@ setup_ok_cb (GtkWidget *but, GtkWidget *win)
|
||||
char buffer[192];
|
||||
|
||||
memcpy (&old_prefs, &prefs, sizeof (prefs));
|
||||
setup_apply (&setup_prefs);
|
||||
theme_preferences_stage_apply ();
|
||||
setup_apply (&setup_prefs);
|
||||
save_result = preferences_persistence_save_all ();
|
||||
if (save_result.success)
|
||||
{
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include "../../fe-gtk.h"
|
||||
|
||||
#include <math.h>
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include "../../fe-gtk.h"
|
||||
|
||||
#include "../theme-application.h"
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include "../../../common/zoitechat.h"
|
||||
#include "../../../common/zoitechatc.h"
|
||||
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include "../theme-gtk3.h"
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include "../../fe-gtk.h"
|
||||
|
||||
#include "../theme-manager.h"
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include "../../fe-gtk.h"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include "../../fe-gtk.h"
|
||||
|
||||
#include "../theme-palette.h"
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include "../../fe-gtk.h"
|
||||
|
||||
#include "../../../common/zoitechat.h"
|
||||
@@ -68,16 +48,6 @@ theme_get_color (ThemeSemanticToken token, GdkRGBA *color)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void
|
||||
theme_get_widget_style_values_for_widget (GtkWidget *widget, ThemeWidgetStyleValues *out_values)
|
||||
{
|
||||
(void)widget;
|
||||
if (!out_values)
|
||||
return;
|
||||
gdk_rgba_parse (&out_values->foreground, "#111111");
|
||||
gdk_rgba_parse (&out_values->background, "#f0f0f0");
|
||||
}
|
||||
|
||||
void
|
||||
theme_manager_set_token_color (unsigned int dark_mode, ThemeSemanticToken token, const GdkRGBA *color, gboolean *changed)
|
||||
{
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include "../../../common/zoitechat.h"
|
||||
#include "../../../common/zoitechatc.h"
|
||||
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include "theme-access.h"
|
||||
|
||||
#include "theme-runtime.h"
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#ifndef ZOITECHAT_THEME_ACCESS_H
|
||||
#define ZOITECHAT_THEME_ACCESS_H
|
||||
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include "theme-application.h"
|
||||
|
||||
#include "../../common/fe.h"
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#ifndef ZOITECHAT_THEME_APPLICATION_H
|
||||
#define ZOITECHAT_THEME_APPLICATION_H
|
||||
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include "theme-css.h"
|
||||
|
||||
#include "theme-runtime.h"
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#ifndef ZOITECHAT_THEME_CSS_H
|
||||
#define ZOITECHAT_THEME_CSS_H
|
||||
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include "theme-gtk3.h"
|
||||
|
||||
#include "../../common/zoitechat.h"
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#ifndef ZOITECHAT_THEME_GTK3_H
|
||||
#define ZOITECHAT_THEME_GTK3_H
|
||||
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include "../fe-gtk.h"
|
||||
#include "theme-manager.h"
|
||||
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#ifndef ZOITECHAT_THEME_MANAGER_H
|
||||
#define ZOITECHAT_THEME_MANAGER_H
|
||||
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include "theme-palette.h"
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#ifndef ZOITECHAT_THEME_PALETTE_H
|
||||
#define ZOITECHAT_THEME_PALETTE_H
|
||||
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include "theme-policy.h"
|
||||
|
||||
#include "../fe-gtk.h"
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#ifndef ZOITECHAT_THEME_POLICY_H
|
||||
#define ZOITECHAT_THEME_POLICY_H
|
||||
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
@@ -723,7 +703,6 @@ theme_preferences_manager_dialog_response_cb (GtkDialog *dialog, gint response_i
|
||||
if (theme_preferences_stage.active)
|
||||
{
|
||||
ThemeSemanticToken token;
|
||||
ThemeWidgetStyleValues style_values;
|
||||
|
||||
for (token = THEME_TOKEN_MIRC_0; token < THEME_TOKEN_COUNT; token++)
|
||||
{
|
||||
@@ -734,12 +713,6 @@ theme_preferences_manager_dialog_response_cb (GtkDialog *dialog, gint response_i
|
||||
theme_preferences_stage.staged[token] = rgba;
|
||||
theme_preferences_stage.staged_valid[token] = TRUE;
|
||||
}
|
||||
theme_get_widget_style_values_for_widget (GTK_WIDGET (dialog), &style_values);
|
||||
theme_preferences_stage.staged[THEME_TOKEN_TEXT_FOREGROUND] = style_values.foreground;
|
||||
theme_preferences_stage.staged_valid[THEME_TOKEN_TEXT_FOREGROUND] = TRUE;
|
||||
theme_preferences_stage.staged[THEME_TOKEN_TEXT_BACKGROUND] = style_values.background;
|
||||
theme_preferences_stage.staged_valid[THEME_TOKEN_TEXT_BACKGROUND] = TRUE;
|
||||
theme_preferences_stage_sync_runtime_to_staged ();
|
||||
theme_preferences_stage_recompute_changed ();
|
||||
if (ui->color_change_flag)
|
||||
*ui->color_change_flag = theme_preferences_stage.changed;
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#ifndef ZOITECHAT_THEME_PREFERENCES_H
|
||||
#define ZOITECHAT_THEME_PREFERENCES_H
|
||||
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
@@ -1,23 +1,3 @@
|
||||
/* ZoiteChat
|
||||
* Copyright (C) 1998-2010 Peter Zelezny.
|
||||
* Copyright (C) 2009-2013 Berke Viktor.
|
||||
* Copyright (C) 2026 deepend-tildeclub.
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#ifndef ZOITECHAT_THEME_RUNTIME_H
|
||||
#define ZOITECHAT_THEME_RUNTIME_H
|
||||
|
||||
|
||||
@@ -61,8 +61,6 @@ Name: "langs"; Description: "Language Interfaces"; Types: custom; Flags: disable
|
||||
Name: "langs\lua"; Description: "Lua"; Types: normal custom; Flags: disablenouninstallwarning
|
||||
Name: "langs\perl"; Description: "Perl (requires Perl 5.42)"; Types: custom; Flags: disablenouninstallwarning
|
||||
Name: "langs\python"; Description: "Python (requires Python 3.14.3)"; Types: custom; Flags: disablenouninstallwarning
|
||||
Name: "deps"; Description: "Dependencies"; Types: custom; Flags: disablenouninstallwarning
|
||||
Name: "deps\vcredist2015"; Description: "Visual C++ Redistributable 2015"; Types: normal minimal custom; Flags: disablenouninstallwarning
|
||||
|
||||
[Tasks]
|
||||
Name: portable; Description: "Yes"; GroupDescription: "Portable Mode: Stores configuration files within install directory for portable drives."; Flags: unchecked
|
||||
@@ -83,7 +81,7 @@ Root: HKCR; Subkey: "ZoiteChat.Theme\shell\open\command"; ValueType: string; Val
|
||||
[Run]
|
||||
Filename: "{app}\zoitechat.exe"; Description: "Run ZoiteChat after closing the Wizard"; Flags: nowait postinstall skipifsilent
|
||||
Filename: "http://docs.zoitechat.org/en/latest/changelog.html"; Description: "See what's changed"; Flags: shellexec runasoriginaluser postinstall skipifsilent unchecked
|
||||
Filename: "{tmp}\vcredist.exe"; Parameters: "/install /quiet /norestart"; StatusMsg: "Installing Visual C++ Redistributable"; Components: deps\vcredist2015; Flags: skipifdoesntexist; Tasks: not portable
|
||||
Filename: "{tmp}\vcredist.exe"; Parameters: "/install /quiet /norestart"; StatusMsg: "Installing Visual C++ Redistributable"; Flags: skipifdoesntexist; Tasks: not portable
|
||||
Filename: "{tmp}\perl.msi"; StatusMsg: "Installing Perl"; Components: langs\perl; Flags: shellexec skipifdoesntexist; Tasks: not portable
|
||||
Filename: "{tmp}\python.msi"; StatusMsg: "Installing Python"; Components: langs\python; Flags: shellexec skipifdoesntexist; Tasks: not portable
|
||||
Filename: "{tmp}\python.exe"; Parameters: "InstallAllUsers=1 PrependPath=1"; StatusMsg: "Installing Python"; Components: langs\python; Flags: shellexec skipifdoesntexist; Tasks: not portable
|
||||
@@ -198,13 +196,6 @@ BeveledLabel= {#APPNAM}
|
||||
|
||||
[Code]
|
||||
#ifndef USE_INNO_DOWNLOAD_PLUGIN
|
||||
var
|
||||
FallbackDownloadUrls: array of String;
|
||||
FallbackDownloadFiles: array of String;
|
||||
|
||||
function URLDownloadToFile(Caller: Integer; URL: String; FileName: String; Reserved: Integer; StatusCB: Integer): Integer;
|
||||
external 'URLDownloadToFileW@urlmon.dll stdcall delayload';
|
||||
|
||||
// The Inno Download Plugin isn't always installed in CI environments.
|
||||
// Provide no-op fallback procedures so installer compilation still succeeds.
|
||||
procedure idpDownloadAfter(PageID: Integer);
|
||||
@@ -213,40 +204,10 @@ end;
|
||||
|
||||
procedure idpClearFiles;
|
||||
begin
|
||||
SetArrayLength(FallbackDownloadUrls, 0);
|
||||
SetArrayLength(FallbackDownloadFiles, 0);
|
||||
end;
|
||||
|
||||
procedure idpAddFile(URL: String; Filename: String);
|
||||
var
|
||||
I: Integer;
|
||||
begin
|
||||
I := GetArrayLength(FallbackDownloadUrls);
|
||||
SetArrayLength(FallbackDownloadUrls, I + 1);
|
||||
SetArrayLength(FallbackDownloadFiles, I + 1);
|
||||
FallbackDownloadUrls[I] := URL;
|
||||
FallbackDownloadFiles[I] := Filename;
|
||||
end;
|
||||
|
||||
function idpDownloadQueuedFiles(): Boolean;
|
||||
var
|
||||
I: Integer;
|
||||
ResultCode: Integer;
|
||||
begin
|
||||
Result := True;
|
||||
for I := 0 to GetArrayLength(FallbackDownloadUrls) - 1 do
|
||||
begin
|
||||
if not FileExists(FallbackDownloadFiles[I]) then
|
||||
begin
|
||||
ResultCode := URLDownloadToFile(0, FallbackDownloadUrls[I], FallbackDownloadFiles[I], 0, 0);
|
||||
if ResultCode <> 0 then
|
||||
begin
|
||||
MsgBox('Unable to download required installer dependency:' + #13#10 + FallbackDownloadUrls[I], mbError, MB_OK);
|
||||
Result := False;
|
||||
Exit;
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
#endif
|
||||
|
||||
@@ -278,30 +239,8 @@ end;
|
||||
|
||||
/////////////////////////////////////////////////////////////////////
|
||||
function CheckVCInstall(): Boolean;
|
||||
var
|
||||
Installed: Cardinal;
|
||||
begin
|
||||
Result := False;
|
||||
if RegQueryDWordValue(HKLM64, 'SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64', 'Installed', Installed) then
|
||||
Result := Installed = 1
|
||||
else if RegQueryDWordValue(HKLM, 'SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64', 'Installed', Installed) then
|
||||
Result := Installed = 1;
|
||||
end;
|
||||
|
||||
procedure UpdateVCRedistComponentState;
|
||||
var
|
||||
I: Integer;
|
||||
Installed: Boolean;
|
||||
begin
|
||||
Installed := CheckVCInstall();
|
||||
for I := 0 to WizardForm.ComponentsList.Items.Count - 1 do
|
||||
begin
|
||||
if WizardForm.ComponentsList.ItemCaption[I] = 'Visual C++ Redistributable 2015' then
|
||||
begin
|
||||
WizardForm.ComponentsList.Checked[I] := not Installed;
|
||||
WizardForm.ComponentsList.ItemEnabled[I] := not Installed;
|
||||
end;
|
||||
end;
|
||||
Result := FileExists(GetSysDir() + 'vcruntime140.dll');;
|
||||
end;
|
||||
|
||||
|
||||
@@ -329,9 +268,6 @@ var
|
||||
PY3: String;
|
||||
SPELL: String;
|
||||
begin
|
||||
if (CurPageID = wpSelectComponents) then
|
||||
UpdateVCRedistComponentState();
|
||||
|
||||
if(CurPageID = wpReady) then
|
||||
begin
|
||||
idpClearFiles;
|
||||
@@ -339,12 +275,12 @@ begin
|
||||
if not IsTaskSelected('portable') then
|
||||
begin
|
||||
|
||||
REDIST := 'https://github.com/ZoiteChat/gvsbuild/releases/download/zoitechat-2.18.0-pre4/vc_redist.x64.exe';
|
||||
REDIST := 'https://github.com/zoitechat/gvsbuild/releases/download/zoitechat-2.16.2/vcredist_2015_x64.exe';
|
||||
PERL := 'https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/download/SP_54201_64bit/strawberry-perl-5.42.0.1-64bit.msi';
|
||||
PY3 := 'https://www.python.org/ftp/python/3.14.3/python-3.14.3-amd64.exe';
|
||||
SPELL := 'https://github.com/zoitechat/gvsbuild/releases/download/zoitechat-2.16.2/ZoiteChat.Spelling.Dictionaries.r2.exe';
|
||||
|
||||
if IsComponentSelected('deps\vcredist2015') and not CheckVCInstall() then
|
||||
if not CheckVCInstall() then
|
||||
idpAddFile(REDIST, ExpandConstant('{tmp}\vcredist.exe'));
|
||||
|
||||
if IsComponentSelected('spell') and not CheckSpellInstall() then
|
||||
@@ -369,17 +305,6 @@ end;
|
||||
/////////////////////////////////////////////////////////////////////
|
||||
function NextButtonClick(CurPageID: Integer): Boolean;
|
||||
begin
|
||||
Result := True;
|
||||
|
||||
#ifndef USE_INNO_DOWNLOAD_PLUGIN
|
||||
if CurPageID = wpReady then
|
||||
if not idpDownloadQueuedFiles() then
|
||||
begin
|
||||
Result := False;
|
||||
Exit;
|
||||
end;
|
||||
#endif
|
||||
|
||||
if (CurPageID = wpSelectTasks) then
|
||||
if (WizardForm.TasksList.Checked[1] = True) then
|
||||
if (WizardDirValue() = ExpandConstant('{pf64}\ZoiteChat')) then
|
||||
@@ -387,6 +312,8 @@ begin
|
||||
WizardForm.TasksList.Checked[1] := False
|
||||
MsgBox('Portable mode is only intended for use on portable drives and has been disabled.', mbInformation, MB_OK)
|
||||
end;
|
||||
|
||||
Result := True; // Always continue
|
||||
end;
|
||||
|
||||
/////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -1 +1 @@
|
||||
2.18.0~pre5
|
||||
2.18.0~pre4
|
||||
|
||||
Reference in New Issue
Block a user