PolytreeDE
/
rofi
mirror of https://github.com/davatorium/rofi.git
1
0
Fork 0
Code Releases Activity

Re-add icon-theme option.

This commit is contained in:
Dave Davenport 2018-06-09 22:17:32 +02:00
parent 441c511296
commit c96ebfc2de
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.c
View File

@ -68,7 +68,7 @@ Settings config = {
/** Command executed on accep-entry-custom for window modus */ /** Command executed on accep-entry-custom for window modus */
.window_command = "xkill -id {window}", .window_command = "xkill -id {window}",
/** No default icon theme, we search Adwaita and gnome as fallback */ /** No default icon theme, we search Adwaita and gnome as fallback */
.drun_icon_theme = NULL, .icon_theme = NULL,
/** /**
* Location of the window. * Location of the window.
* Enumeration indicating location or gravity of window. * Enumeration indicating location or gravity of window.

4
doc/rofi.1.markdown
View File

@ -199,9 +199,9 @@ Specify the directory where **rofi** should look for plugins.
Show application icons in drun and window modes. Show application icons in drun and window modes.
`-drun-icon-theme` `-icon-theme`
Specify icon theme to be used in drun mode if show-icons setting is enabled. Specify icon theme to be used.
If not specified default theme from DE is used, *Adwaita* and *gnome* themes act as If not specified default theme from DE is used, *Adwaita* and *gnome* themes act as
fallback themes. fallback themes.

2
doc/test_xr.txt
View File

@ -39,7 +39,7 @@ rofi.window-command: xkill -id {window}
! "Window fields to match in window mode" Set from: Default ! "Window fields to match in window mode" Set from: Default
! rofi.window-match-fields: all ! rofi.window-match-fields: all
! "Theme to use to look for icons" Set from: Default ! "Theme to use to look for icons" Set from: Default
! rofi.drun-icon-theme: ! rofi.icon-theme:
! "Desktop entry fields to match in drun" Set from: Default ! "Desktop entry fields to match in drun" Set from: Default
! rofi.drun-match-fields: name,generic,exec,categories ! rofi.drun-match-fields: name,generic,exec,categories
! "Disable history in run/ssh" Set from: File ! "Disable history in run/ssh" Set from: File

2
include/settings.h
View File

@ -88,7 +88,7 @@ typedef struct
/** Window fields to match in window mode */ /** Window fields to match in window mode */
char * window_match_fields; char * window_match_fields;
/** Theme for icons */ /** Theme for icons */
char * drun_icon_theme; char * icon_theme;
/** Windows location/gravity */ /** Windows location/gravity */
WindowLocation location; WindowLocation location;

2
source/rofi-icon-fetcher.c
View File

@ -30,6 +30,7 @@
#include "rofi-icon-fetcher.h" #include "rofi-icon-fetcher.h"
#include "rofi-types.h" #include "rofi-types.h"
#include "helper.h" #include "helper.h"
#include "settings.h"
typedef struct { typedef struct {
@ -131,6 +132,7 @@ static void rofi_icon_fetcher_worker ( thread_state *sdata, G_GNUC_UNUSED gpoint
// this should be fine running in another thread. // this should be fine running in another thread.
IconFetcherEntry *sentry = (IconFetcherEntry*) sdata; IconFetcherEntry *sentry = (IconFetcherEntry*) sdata;
const gchar *themes[1] = { const gchar *themes[1] = {
config.icon_theme,
NULL NULL
}; };

2
source/xrmoptions.c
View File

@ -130,7 +130,7 @@ static XrmOption xrmOptions[] = {
"Command executed on accep-entry-custom for window modus", CONFIG_DEFAULT }, "Command executed on accep-entry-custom for window modus", CONFIG_DEFAULT },
{ xrm_String, "window-match-fields", { .str = &config.window_match_fields }, NULL, { xrm_String, "window-match-fields", { .str = &config.window_match_fields }, NULL,
"Window fields to match in window mode", CONFIG_DEFAULT }, "Window fields to match in window mode", CONFIG_DEFAULT },
{ xrm_String, "drun-icon-theme", { .str = &config.drun_icon_theme }, NULL, { xrm_String, "icon-theme", { .str = &config.icon_theme }, NULL,
"Theme to use to look for icons", CONFIG_DEFAULT }, "Theme to use to look for icons", CONFIG_DEFAULT },
{ xrm_String, "drun-match-fields", { .str = &config.drun_match_fields }, NULL, { xrm_String, "drun-match-fields", { .str = &config.drun_match_fields }, NULL,