DeforaOS/Panel
DeforaOS/Panel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Using the adequate orientation

Browse Source
This commit is contained in:
Pierre Pronchery 2014-03-17 22:53:37 +09:00
parent 1e60d8a741
commit dc7cd33599
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/applets/network.c
View File

@ -93,8 +93,12 @@ static Network * _network_init(PanelAppletHelper * helper, GtkWidget ** widget)
return NULL; return NULL;
} }
network->helper = helper; network->helper = helper;
/* FIXME the orientation may be wrong */ #if GTK_CHECK_VERSION(3, 0, 0)
network->widget = gtk_hbox_new(TRUE, 0); network->widget = gtk_box_new(helper->orientation, 0);
#else
network->widget = (helper->orientation == GTK_ORIENTATION_HORIZONTAL)
? gtk_hbox_new(TRUE, 0) : gtk_vbox_new(TRUE, 0);
#endif
gtk_widget_show(network->widget); gtk_widget_show(network->widget);
network->source = g_timeout_add(500, _network_on_timeout, network); network->source = g_timeout_add(500, _network_on_timeout, network);
if((network->fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) if((network->fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0)

10
src/applets/player.c
View File

@ -1,5 +1,5 @@
/* $Id$ */ /* $Id$ */
/* Copyright (c) 2013 Pierre Pronchery <khorben@defora.org> */ /* Copyright (c) 2013-2014 Pierre Pronchery <khorben@defora.org> */
/* This file is part of DeforaOS Desktop Panel */ /* This file is part of DeforaOS Desktop Panel */
/* This program is free software: you can redistribute it and/or modify /* 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 * it under the terms of the GNU General Public License as published by
@ -79,8 +79,12 @@ static Player * _player_init(PanelAppletHelper * helper, GtkWidget ** widget)
return NULL; return NULL;
} }
player->helper = helper; player->helper = helper;
/* FIXME choose the adequate orientation */ #if GTK_CHECK_VERSION(3, 0, 0)
player->widget = gtk_hbox_new(FALSE, 0); player->widget = gtk_box_new(helper->orientation, 0);
#else
player->widget = (helper->orientation == GTK_ORIENTATION_HORIZONTAL)
? gtk_hbox_new(FALSE, 0) : gtk_vbox_new(FALSE, 0);
#endif
_init_add(player->widget, GTK_STOCK_MEDIA_PREVIOUS, helper->icon_size, _init_add(player->widget, GTK_STOCK_MEDIA_PREVIOUS, helper->icon_size,
_("Previous"), _player_on_previous); _("Previous"), _player_on_previous);
_init_add(player->widget, GTK_STOCK_MEDIA_REWIND, helper->icon_size, _init_add(player->widget, GTK_STOCK_MEDIA_REWIND, helper->icon_size,