Compare commits
5 Commits
67ef283dc8
...
3c43c20196
Author | SHA1 | Date |
---|---|---|
Zack Middleton | 3c43c20196 | |
Zack Middleton | a6cf9de19e | |
Thomas Debesse | a04eab96f4 | |
Thomas Debesse | 11d1164cec | |
Thomas Debesse | d115b11905 |
|
@ -0,0 +1,35 @@
|
|||
name: Build
|
||||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
linux-gcc:
|
||||
name: GCC (Linux)
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Install Dependencies
|
||||
run: |
|
||||
sudo apt update
|
||||
sudo apt install -y qstat intltool cmake libgtk2.0-dev libgeoip-dev libminizip-dev
|
||||
- name: cmake
|
||||
run: CC=gcc CXX=g++ cmake -DWITH_QSTAT=/usr/bin/quakestat -DCMAKE_C_FLAGS=-Werror .
|
||||
- name: make
|
||||
run: make
|
||||
- name: make install
|
||||
run: sudo make install
|
||||
|
||||
linux-clang:
|
||||
name: Clang (Linux)
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Install Dependencies
|
||||
run: |
|
||||
sudo apt update
|
||||
sudo apt install -y qstat intltool cmake libgtk2.0-dev libgeoip-dev libminizip-dev
|
||||
- name: cmake
|
||||
run: CC=clang CXX=clang++ cmake -DWITH_QSTAT=/usr/bin/quakestat -DCMAKE_C_FLAGS=-Werror .
|
||||
- name: make
|
||||
run: make
|
||||
- name: make install
|
||||
run: sudo make install
|
17
.travis.yml
17
.travis.yml
|
@ -1,17 +0,0 @@
|
|||
language: c
|
||||
|
||||
compiler:
|
||||
- clang
|
||||
- gcc
|
||||
|
||||
before_install:
|
||||
- sudo -s tools/travis_update_packages
|
||||
|
||||
script:
|
||||
- cmake -DWITH_QSTAT=/usr/bin/quakestat -DCMAKE_C_FLAGS=-Werror .
|
||||
- make
|
||||
|
||||
notifications:
|
||||
irc: "chat.freenode.net#xqf"
|
||||
on_success: change
|
||||
on_failure: always
|
39
src/pref.c
39
src/pref.c
|
@ -98,7 +98,6 @@ int default_save_plrinfo;
|
|||
int default_auto_favorites;
|
||||
int default_auto_maps;
|
||||
int skip_startup_mapscan;
|
||||
int default_toolbar_style;
|
||||
int default_refresh_sorts;
|
||||
int default_refresh_on_update;
|
||||
int default_resolve_on_update;
|
||||
|
@ -171,7 +170,6 @@ static GtkWidget *auto_maps_check_button;
|
|||
|
||||
static GtkWidget *show_hostnames_check_button;
|
||||
static GtkWidget *show_defport_check_button;
|
||||
static GtkWidget *toolbar_style_radio_buttons[3];
|
||||
static GtkWidget *countbots_check_button;
|
||||
static GtkWidget *refresh_sorts_check_button;
|
||||
static GtkWidget *refresh_on_update_check_button;
|
||||
|
@ -1196,15 +1194,6 @@ static void get_new_defaults (void) {
|
|||
|
||||
config_push_prefix ("/" CONFIG_FILE "/Appearance");
|
||||
|
||||
for (i = 0; i < 3; i++) {
|
||||
if (GTK_TOGGLE_BUTTON (toolbar_style_radio_buttons[i])->active) {
|
||||
if (i != default_toolbar_style) {
|
||||
config_set_int ("toolbar style", default_toolbar_style = i);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
i = GTK_TOGGLE_BUTTON (countbots_check_button)->active;
|
||||
if (i != serverlist_countbots) {
|
||||
config_set_bool ("count bots", serverlist_countbots = i);
|
||||
|
@ -3688,9 +3677,6 @@ static GtkWidget *appearance_options_page (void) {
|
|||
GtkWidget *frame;
|
||||
GtkWidget *hbox;
|
||||
GtkWidget *vbox;
|
||||
GSList *group = NULL;
|
||||
static const char *toolbar_styles[] = { N_("Icons"), N_("Text"), N_("Both") };
|
||||
int i;
|
||||
|
||||
page_vbox = gtk_vbox_new (FALSE, 4);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (page_vbox), 8);
|
||||
|
@ -3794,30 +3780,6 @@ static GtkWidget *appearance_options_page (void) {
|
|||
gtk_widget_show (vbox);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
|
||||
/* Toolbar */
|
||||
|
||||
frame = gtk_frame_new (_("Toolbar"));
|
||||
gtk_box_pack_start (GTK_BOX (page_vbox), frame, FALSE, FALSE, 0);
|
||||
|
||||
hbox = gtk_hbox_new (FALSE, 4);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
|
||||
gtk_container_add (GTK_CONTAINER (frame), hbox);
|
||||
|
||||
/* Toolbar Style */
|
||||
|
||||
for (i = 0; i < 3; i++) {
|
||||
toolbar_style_radio_buttons[i] = gtk_radio_button_new_with_label (group, _(toolbar_styles[i]));
|
||||
group = gtk_radio_button_group (GTK_RADIO_BUTTON (toolbar_style_radio_buttons[i]));
|
||||
gtk_box_pack_start (GTK_BOX (hbox), toolbar_style_radio_buttons[i], FALSE, FALSE, 0);
|
||||
gtk_widget_show (toolbar_style_radio_buttons[i]);
|
||||
}
|
||||
|
||||
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toolbar_style_radio_buttons[default_toolbar_style]), TRUE);
|
||||
|
||||
gtk_widget_show (hbox);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
gtk_widget_show (page_vbox);
|
||||
|
||||
return page_vbox;
|
||||
|
@ -4754,7 +4716,6 @@ int prefs_load (void) {
|
|||
show_hostnames = config_get_bool("show hostnames=true");
|
||||
show_default_port = config_get_bool("show default port=true");
|
||||
serverlist_countbots = config_get_bool("count bots=true");
|
||||
default_toolbar_style = config_get_int("toolbar style=2");
|
||||
default_refresh_sorts = config_get_bool("sort on refresh=true");
|
||||
default_refresh_on_update = config_get_bool("refresh on update=true");
|
||||
default_resolve_on_update = config_get_bool("resolve on update=false");
|
||||
|
|
|
@ -89,7 +89,6 @@ extern int default_save_srvinfo;
|
|||
extern int default_save_plrinfo;
|
||||
extern int default_auto_favorites;
|
||||
extern int default_always_resolve;
|
||||
extern int default_toolbar_style;
|
||||
extern int default_refresh_sorts;
|
||||
extern int default_refresh_on_update;
|
||||
extern int default_resolve_on_update;
|
||||
|
|
2
src/rc.c
2
src/rc.c
|
@ -81,8 +81,6 @@ static struct keyword keywords[] = {
|
|||
|
||||
{ "autofavorites", KEYWORD_BOOL, "/" CONFIG_FILE "/General/refresh favorites" },
|
||||
|
||||
{ "tb_style", KEYWORD_INT, "/" CONFIG_FILE "/Appearance/toolbar style" },
|
||||
|
||||
{ "sort_on_refresh", KEYWORD_BOOL, "/" CONFIG_FILE "/Appearance/sort on refresh" },
|
||||
{ "ref_on_update", KEYWORD_BOOL, "/" CONFIG_FILE "/Appearance/refresh on update" },
|
||||
{ "alwaysresolve", KEYWORD_BOOL, "/" CONFIG_FILE "/Appearance/show hostnames" },
|
||||
|
|
|
@ -589,13 +589,8 @@ int calculate_clist_row_height (GtkWidget *clist, GdkPixmap *pixmap) {
|
|||
}
|
||||
#endif
|
||||
|
||||
void set_toolbar_appearance (GtkToolbar *toolbar, int style) {
|
||||
switch (style) {
|
||||
case 0: gtk_toolbar_set_style (toolbar, GTK_TOOLBAR_ICONS); break;
|
||||
case 1: gtk_toolbar_set_style (toolbar, GTK_TOOLBAR_TEXT); break;
|
||||
case 2: gtk_toolbar_set_style (toolbar, GTK_TOOLBAR_BOTH); break;
|
||||
default: break;
|
||||
}
|
||||
void set_toolbar_appearance (GtkToolbar *toolbar) {
|
||||
gtk_toolbar_set_style(toolbar, GTK_TOOLBAR_BOTH);
|
||||
gtk_toolbar_set_tooltips(toolbar, TRUE);
|
||||
}
|
||||
|
||||
|
|
|
@ -101,7 +101,7 @@ extern void source_ctree_select_source (struct master *m);
|
|||
|
||||
extern int calculate_clist_row_height (GtkWidget *clist, GdkPixmap *pixmap);
|
||||
|
||||
extern void set_toolbar_appearance (GtkToolbar *toolbar, int style);
|
||||
extern void set_toolbar_appearance (GtkToolbar *toolbar);
|
||||
|
||||
extern GtkWidget *create_progress_bar (void);
|
||||
extern void progress_bar_reset (GtkWidget *pbar);
|
||||
|
|
|
@ -379,7 +379,6 @@ void server_filter_select_callback (GtkWidget *widget, int number) {
|
|||
|
||||
void start_preferences_dialog (GtkWidget *widget, int page_num) {
|
||||
preferences_dialog (page_num);
|
||||
set_toolbar_appearance (GTK_TOOLBAR (gtk_builder_get_object (builder, "main-toolbar")), default_toolbar_style);
|
||||
}
|
||||
|
||||
|
||||
|
@ -2154,7 +2153,7 @@ void populate_main_toolbar (void) {
|
|||
gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (filter_buttons[i]), ((cur_filter & mask) != 0)? TRUE : FALSE);
|
||||
}
|
||||
|
||||
set_toolbar_appearance (GTK_TOOLBAR (gtk_builder_get_object (builder, "main-toolbar")), default_toolbar_style);
|
||||
set_toolbar_appearance (GTK_TOOLBAR (gtk_builder_get_object (builder, "main-toolbar")));
|
||||
}
|
||||
|
||||
// build server filter menu for toolbar
|
||||
|
|
|
@ -1,48 +0,0 @@
|
|||
#! /bin/sh
|
||||
|
||||
# Author: Thomas Debesse
|
||||
# License: ISC
|
||||
|
||||
# please run this script as root user
|
||||
# please use tabs for indentation (heredocs starting with <<-EOF need tabs)
|
||||
|
||||
echo 'Updating package list'
|
||||
apt-get update -qq
|
||||
|
||||
# ubuntu trusty dependencies
|
||||
echo 'Installing qstat, intltool, cmake, libgtk2.0-dev, libgeoip-dev dependencies'
|
||||
apt-get install -q -y qstat intltool cmake libgtk2.0-dev libgeoip-dev
|
||||
|
||||
# libminizip-dev is not in trusty
|
||||
# building xqf requires gettext 0.19 or later for 'msgfmt --desktop'
|
||||
|
||||
# if release is older than xenial (16.04)
|
||||
if [ "$(lsb_release -sr | cut -c1-2)" -lt '16' ]
|
||||
then
|
||||
echo 'Adding xenial respository'
|
||||
<<-EOF cat >> '/etc/apt/sources.list.d/ubuntu-xenial-main.list'
|
||||
deb http://archive.ubuntu.com/ubuntu xenial main universe
|
||||
EOF
|
||||
|
||||
echo 'Pin xenial repository to disable package installation from this repository by default'
|
||||
<<-EOF cat > '/etc/apt/preferences.d/xenial-pinning'
|
||||
Package: *
|
||||
Pin: release n=xenial
|
||||
Pin-Priority: -100
|
||||
EOF
|
||||
|
||||
echo 'Adding the xenial repository key'
|
||||
apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 3B4FE6ACC0B21F32
|
||||
|
||||
echo 'Updating package list'
|
||||
apt-get update -qq
|
||||
|
||||
echo 'Installing libminizip-dev gettext dependencies from xenial repository'
|
||||
# updated gettext requires libgomp1 gcc-5-base
|
||||
apt-get install -y -q -t xenial libminizip-dev gettext libgomp1 gcc-5-base
|
||||
else
|
||||
echo 'Installing libminizip-dev dependency'
|
||||
apt-get install -q -y libminizip-dev
|
||||
fi
|
||||
|
||||
#EOF
|
Loading…
Reference in New Issue