Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
xfce4-panel
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Simon Steinbeiß
xfce4-panel
Commits
3ca59773
Commit
3ca59773
authored
Jul 12, 2020
by
Sean Davis
🕶
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use the correct terminology
parent
afd8d0cc
Pipeline
#1265
passed with stages
in 4 minutes and 41 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
22 deletions
+22
-22
plugins/systray/sn-config.c
plugins/systray/sn-config.c
+17
-17
plugins/systray/sn-config.h
plugins/systray/sn-config.h
+1
-1
plugins/systray/sn-dialog.c
plugins/systray/sn-dialog.c
+2
-2
plugins/systray/sn-dialog.glade
plugins/systray/sn-dialog.glade
+1
-1
plugins/systray/systray-box.c
plugins/systray/systray-box.c
+1
-1
No files found.
plugins/systray/sn-config.c
View file @
3ca59773
...
...
@@ -47,7 +47,7 @@
#define DEFAULT_ORIENTATION GTK_ORIENTATION_HORIZONTAL
#define DEFAULT_PANEL_ORIENTATION GTK_ORIENTATION_HORIZONTAL
#define DEFAULT_PANEL_SIZE 28
#define DEFAULT_
SHOW
_NEW_ITEMS FALSE
#define DEFAULT_
HIDE
_NEW_ITEMS FALSE
...
...
@@ -79,7 +79,7 @@ struct _SnConfig
gboolean
square_icons
;
gboolean
symbolic_icons
;
gboolean
menu_is_primary
;
gboolean
show
_new_items
;
gboolean
hide
_new_items
;
GList
*
known_items
;
GHashTable
*
hidden_items
;
GList
*
known_legacy_items
;
...
...
@@ -105,7 +105,7 @@ enum
PROP_SQUARE_ICONS
,
PROP_SYMBOLIC_ICONS
,
PROP_MENU_IS_PRIMARY
,
PROP_
SHOW
_NEW_ITEMS
,
PROP_
HIDE
_NEW_ITEMS
,
PROP_KNOWN_ITEMS
,
PROP_HIDDEN_ITEMS
,
PROP_KNOWN_LEGACY_ITEMS
,
...
...
@@ -198,9 +198,9 @@ sn_config_class_init (SnConfigClass *klass)
G_PARAM_STATIC_STRINGS
));
g_object_class_install_property
(
object_class
,
PROP_
SHOW
_NEW_ITEMS
,
g_param_spec_boolean
(
"
show
-new-items"
,
NULL
,
NULL
,
DEFAULT_
SHOW
_NEW_ITEMS
,
PROP_
HIDE
_NEW_ITEMS
,
g_param_spec_boolean
(
"
hide
-new-items"
,
NULL
,
NULL
,
DEFAULT_
HIDE
_NEW_ITEMS
,
G_PARAM_READWRITE
|
G_PARAM_STATIC_STRINGS
));
...
...
@@ -286,7 +286,7 @@ sn_config_init (SnConfig *config)
config
->
single_row
=
DEFAULT_SINGLE_ROW
;
config
->
square_icons
=
DEFAULT_SQUARE_ICONS
;
config
->
symbolic_icons
=
DEFAULT_SYMBOLIC_ICONS
;
config
->
show_new_items
=
DEFAULT_SHOW
_NEW_ITEMS
;
config
->
hide_new_items
=
DEFAULT_HIDE
_NEW_ITEMS
;
config
->
known_items
=
NULL
;
config
->
hidden_items
=
g_hash_table_new_full
(
g_str_hash
,
g_str_equal
,
g_free
,
NULL
);
config
->
known_legacy_items
=
NULL
;
...
...
@@ -377,8 +377,8 @@ sn_config_get_property (GObject *object,
g_value_set_boolean
(
value
,
config
->
menu_is_primary
);
break
;
case
PROP_
SHOW
_NEW_ITEMS
:
g_value_set_boolean
(
value
,
config
->
show
_new_items
);
case
PROP_
HIDE
_NEW_ITEMS
:
g_value_set_boolean
(
value
,
config
->
hide
_new_items
);
break
;
case
PROP_KNOWN_ITEMS
:
...
...
@@ -490,11 +490,11 @@ sn_config_set_property (GObject *object,
}
break
;
case
PROP_
SHOW
_NEW_ITEMS
:
case
PROP_
HIDE
_NEW_ITEMS
:
val
=
g_value_get_boolean
(
value
);
if
(
config
->
show
_new_items
!=
val
)
if
(
config
->
hide
_new_items
!=
val
)
{
config
->
show
_new_items
=
val
;
config
->
hide
_new_items
=
val
;
g_signal_emit
(
G_OBJECT
(
config
),
sn_config_signals
[
ITEM_LIST_CHANGED
],
0
);
g_signal_emit
(
G_OBJECT
(
config
),
sn_config_signals
[
LEGACY_ITEM_LIST_CHANGED
],
0
);
}
...
...
@@ -914,7 +914,7 @@ sn_config_add_known_item (SnConfig *config,
config
->
known_items
=
g_list_prepend
(
config
->
known_items
,
g_strdup
(
name
));
if
(
config
->
show
_new_items
)
if
(
config
->
hide
_new_items
)
{
name_copy
=
g_strdup
(
name
);
g_hash_table_replace
(
config
->
hidden_items
,
name_copy
,
name_copy
);
...
...
@@ -943,7 +943,7 @@ sn_config_add_known_legacy_item (SnConfig *config,
config
->
known_legacy_items
=
g_list_prepend
(
config
->
known_legacy_items
,
g_strdup
(
name
));
if
(
config
->
show
_new_items
)
if
(
config
->
hide
_new_items
)
{
name_copy
=
g_strdup
(
name
);
g_hash_table_replace
(
config
->
hidden_legacy_items
,
name_copy
,
name_copy
);
...
...
@@ -953,7 +953,7 @@ sn_config_add_known_legacy_item (SnConfig *config,
g_object_notify
(
G_OBJECT
(
config
),
"known-legacy-items"
);
g_signal_emit
(
G_OBJECT
(
config
),
sn_config_signals
[
LEGACY_ITEM_LIST_CHANGED
],
0
);
return
config
->
show
_new_items
;
return
config
->
hide
_new_items
;
}
...
...
@@ -1141,8 +1141,8 @@ sn_config_new (const gchar *property_base)
xfconf_g_property_bind
(
channel
,
property
,
G_TYPE_BOOLEAN
,
config
,
"menu-is-primary"
);
g_free
(
property
);
property
=
g_strconcat
(
property_base
,
"/
show
-new-items"
,
NULL
);
xfconf_g_property_bind
(
channel
,
property
,
G_TYPE_BOOLEAN
,
config
,
"
show
-new-items"
);
property
=
g_strconcat
(
property_base
,
"/
hide
-new-items"
,
NULL
);
xfconf_g_property_bind
(
channel
,
property
,
G_TYPE_BOOLEAN
,
config
,
"
hide
-new-items"
);
g_free
(
property
);
property
=
g_strconcat
(
property_base
,
"/known-items"
,
NULL
);
...
...
plugins/systray/sn-config.h
View file @
3ca59773
...
...
@@ -118,7 +118,7 @@ gboolean sn_config_legacy_items_clear (SnConfig
#define DEFAULT_ORIENTATION GTK_ORIENTATION_HORIZONTAL
#define DEFAULT_PANEL_ORIENTATION GTK_ORIENTATION_HORIZONTAL
#define DEFAULT_PANEL_SIZE 28
#define DEFAULT_
SHOW
_NEW_ITEMS FALSE
#define DEFAULT_
HIDE
_NEW_ITEMS FALSE
...
...
plugins/systray/sn-dialog.c
View file @
3ca59773
...
...
@@ -761,9 +761,9 @@ sn_dialog_build (SnDialog *dialog)
G_OBJECT
(
object
),
"active"
,
G_BINDING_SYNC_CREATE
|
G_BINDING_BIDIRECTIONAL
);
object
=
gtk_builder_get_object
(
dialog
->
builder
,
"checkbutton-
show
-new-items"
);
object
=
gtk_builder_get_object
(
dialog
->
builder
,
"checkbutton-
hide
-new-items"
);
g_return_val_if_fail
(
GTK_IS_WIDGET
(
object
),
FALSE
);
g_object_bind_property
(
G_OBJECT
(
dialog
->
config
),
"
show
-new-items"
,
g_object_bind_property
(
G_OBJECT
(
dialog
->
config
),
"
hide
-new-items"
,
G_OBJECT
(
object
),
"active"
,
G_BINDING_SYNC_CREATE
|
G_BINDING_BIDIRECTIONAL
);
...
...
plugins/systray/sn-dialog.glade
View file @
3ca59773
...
...
@@ -257,7 +257,7 @@
</packing>
</child>
<child>
<object
class=
"GtkCheckButton"
id=
"checkbutton-
show
-new-items"
>
<object
class=
"GtkCheckButton"
id=
"checkbutton-
hide
-new-items"
>
<property
name=
"label"
translatable=
"yes"
>
_Hide items by default
</property>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
True
</property>
...
...
plugins/systray/systray-box.c
View file @
3ca59773
...
...
@@ -174,7 +174,7 @@ systray_box_init (SystrayBox *box)
box
->
n_hidden_children
=
0
;
box
->
n_visible_children
=
0
;
box
->
horizontal
=
TRUE
;
box
->
show_hidden
=
DEFAULT_
SHOW
_NEW_ITEMS
;
box
->
show_hidden
=
DEFAULT_
HIDE
_NEW_ITEMS
;
box
->
square_icons
=
DEFAULT_SQUARE_ICONS
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment