gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-02-03 06:45:51 +01:00
Code Issues Projects Releases Wiki Activity

New titlebar button style

Browse Source 
This patch adds new titlebar button style.

Original-patch-by: Carlos Torres <vlaadbrain@operamail.com>
Signed-off-by: Alexey I. Froloff <raorn@altlinux.org>
This commit is contained in:
Alexey I. Froloff
2010-09-10 20:51:08 +04:00
committed by Carlos R. Mafra
parent cc629f342c
commit 17cc7c3c77
15 changed files with 682 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
WPrefs.app/Configurations.c
View File

@@ -41,6 +41,7 @@ typedef struct _Panel {
WMFrame *titlF;
WMButton *oldsB;
WMButton *newsB;
WMButton *nextB;
WMFrame *animF;
WMButton *animB;
@@ -63,6 +64,7 @@ typedef struct _Panel {
#define ICON_FILE "configs"
#define OLDS_IMAGE "oldstyle"
#define NEWS_IMAGE "newstyle"
#define NEXT_IMAGE "nextstyle"
#define ANIM_IMAGE "animations"
#define SUPERF_IMAGE "moreanim"
#define SMOOTH_IMAGE "smooth"
@@ -74,13 +76,19 @@ static void updateLabel(WMWidget *self, void *data);
static void showData(_Panel *panel)
{
char *str;
WMPerformButtonClick(panel->icoB[GetSpeedForKey("IconSlideSpeed")]);
WMPerformButtonClick(panel->shaB[GetSpeedForKey("ShadeSpeed")]);
if (GetBoolForKey("NewStyle"))
WMPerformButtonClick(panel->newsB);
else
str = GetStringForKey("Newstyle");
if (str && strcasecmp(str, "next") == 0) {
WMPerformButtonClick(panel->nextB);
} else if (str && strcasecmp(str, "old") == 0) {
WMPerformButtonClick(panel->oldsB);
} else {
WMPerformButtonClick(panel->newsB);
}
WMSetButtonSelected(panel->animB, !GetBoolForKey("DisableAnimations"));
WMSetButtonSelected(panel->supB, GetBoolForKey("Superfluous"));
@@ -287,10 +295,11 @@ static void createPanel(Panel *p)
WMSetButtonImage(panel->newsB, icon);
WMReleasePixmap(icon);
}
wfree(path);
}
panel->oldsB = WMCreateButton(panel->titlF, WBTOnOff);
WMResizeWidget(panel->oldsB, 74, 40);
WMResizeWidget(panel->oldsB, 37, 40);
WMMoveWidget(panel->oldsB, 15, 60);
WMSetButtonImagePosition(panel->oldsB, WIPImageOnly);
path = LocateImage(OLDS_IMAGE);
@@ -303,7 +312,22 @@ static void createPanel(Panel *p)
wfree(path);
}
panel->nextB = WMCreateButton(panel->titlF, WBTOnOff);
WMResizeWidget(panel->nextB, 37, 40);
WMMoveWidget(panel->nextB, 52, 60);
WMSetButtonImagePosition(panel->nextB, WIPImageOnly);
path = LocateImage(NEXT_IMAGE);
if (path) {
icon = WMCreatePixmapFromFile(scr, path);
if (icon) {
WMSetButtonImage(panel->nextB, icon);
WMReleasePixmap(icon);
}
wfree(path);
}
WMGroupButtons(panel->newsB, panel->oldsB);
WMGroupButtons(panel->newsB, panel->nextB);
WMMapSubwidgets(panel->titlF);
@@ -425,7 +449,13 @@ static void storeData(_Panel *panel)
}
SetSpeedForKey(i, "ShadeSpeed");
SetBoolForKey(WMGetButtonSelected(panel->newsB), "NewStyle");
if (WMGetButtonSelected(panel->newsB)) {
SetStringForKey("new", "NewStyle");
} else if (WMGetButtonSelected(panel->oldsB)) {
SetStringForKey("old", "NewStyle");
} else {
SetStringForKey("next", "NewStyle");
}
SetBoolForKey(!WMGetButtonSelected(panel->animB), "DisableAnimations");
SetBoolForKey(WMGetButtonSelected(panel->supB), "Superfluous");
SetBoolForKey(WMGetButtonSelected(panel->smoB), "SmoothWorkspaceBack");

1
WPrefs.app/tiff/Makefile.am
View File

@@ -28,6 +28,7 @@ EXTRA_DIST = \
msty2.tiff \
msty3.tiff \
newstyle.tiff \
nextstyle.tiff \
nonopaque.tiff \
oldstyle.tiff \
opaque.tiff \

BIN
WPrefs.app/tiff/nextstyle.tiff Normal file
View File

Binary file not shown.

BIN
WPrefs.app/tiff/oldstyle.tiff
View File

Binary file not shown.

1
WPrefs.app/xpm/Makefile.am
View File

@@ -28,6 +28,7 @@ EXTRA_DIST = \
msty2.xpm \
msty3.xpm \
newstyle.xpm \
nextstyle.xpm \
nonopaque.xpm \
oldstyle.xpm \
opaque.xpm \

120
WPrefs.app/xpm/nextstyle.xpm Normal file
View File

@@ -0,0 +1,120 @@
/* XPM */
static char * nextstyle_xpm[] = {
"37 33 84 1",
" c None",
". c #747474",
"+ c #757575",
"@ c #000000",
"# c #222222",
"$ c #262626",
"% c #282828",
"& c #080808",
"* c #FFFFFF",
"= c #FFFAFF",
"- c #FFFFF6",
"; c #F6F6F6",
"> c #F6F2F6",
", c #EEEEEE",
"' c #B4B6B4",
") c #8B8D94",
"! c #DEE6E6",
"~ c #E6E6EE",
"{ c #CDD2CD",
"] c #A4A1A4",
"^ c #313431",
"/ c #94918B",
"( c #EEF6F6",
"_ c #292829",
": c #C5CACD",
"< c #E6E6E6",
"[ c #A4A5AC",
"} c #414039",
"| c #948D8B",
"1 c #8B8D8B",
"2 c #292C29",
"3 c #D5D6D5",
"4 c #B4BAB4",
"5 c #313029",
"6 c #DEDADE",
"7 c #A4A5A4",
"8 c #8B898B",
"9 c #F6FAFF",
"0 c #F6FFFF",
"a c #DEDEDE",
"b c #181818",
"c c #E6EAE6",
"d c #C5C6C5",
"e c #8B8983",
"f c #EEF2F6",
"g c #EEEEF6",
"h c #101010",
"i c #201818",
"j c #838183",
"k c #838983",
"l c #949594",
"m c #202420",
"n c #CDCECD",
"o c #BDBABD",
"p c #202018",
"q c #736D73",
"r c #6A7573",
"s c #83817B",
"t c #B4B2B4",
"u c #202829",
"v c #C5C2C5",
"w c #201C18",
"x c #5A5552",
"y c #7B757B",
"z c #393C41",
"A c #CDD2D5",
"B c #D5D2D5",
"C c #9CA1A4",
"D c #BDBAB4",
"E c #8B8583",
"F c #6A6D6A",
"G c #949994",
"H c #A4AAAC",
"I c #94999C",
"J c #94958B",
"K c #94898B",
"L c #83818B",
"M c #73756A",
"N c #837D83",
"O c #060606",
"P c #070707",
"Q c #030303",
"R c #ABABAB",
"S c #535353",
"..................+++++++...........@",
"##################$$$$$$$%$%$$$$$$$$@",
"##################$$$$$$$$%%%%%%%%%%@",
"###################################%@",
"###################################%&",
"####################@@@@@@@@@@@@*%%%&",
"####################@=****-;>,'@*%%%&",
"####################@*)!=;~{]^/@*%%%&",
"####################@*(_:><[}|1@*%%%&",
"####################@**:2345678@*%%%&",
"####################@*90ab_cd/e@*%%%&",
"####################@9fg3hid7jk@*%%%&",
"####################@;almnopqrs@*%%%&",
"####################@>tuva67wxy@*%%%&",
"####################@,zABClDEbF@*%%%&",
"####################@'GHIJKeLMN@*%%%&",
"####################@@@@@@@@@@@@*%%%&",
"####################*************%%%&",
"##################$$$$$$$$$%%%%%%%%%&",
"##################$$$$$$$%$%%%%%%%%%&",
"OOOOOOOOOOOOOOOOOOPPPPPPPPPPPPP&&&&&Q",
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
"RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR@",
"RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR@",
"RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR@",
"RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR@",
"SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS*RR@",
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@R*RR@",
"********************************R*RR@",
"********************************R*RR@",
"********************************R*RR@",
"********************************R*RR@",
"********************************R*RR@"};

94
WPrefs.app/xpm/oldstyle.xpm
View File

@@ -1,45 +1,51 @@
/* XPM */
static char * image_name[] = {
"38 33 9 1",
" c #739C739C739C",
". c #000000000000",
"X c #210821082108",
"o c #294A294A294A",
"O c #FFFFFFFFFFFF",
"+ c #084208420842",
"@ c #A528A528A528",
"# c #529452945294",
"$ c #AD6AAD6AAD6A",
" .",
"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo.",
"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo.",
"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo.",
"XXXXXXXXXXXXXXXXXXXoOOOOOOOOOOOOOOooo+",
"XXXXXXXXXXXXXXXXXXXoO@@@@@@@@@@@@#ooo+",
"XXXXXXXXXXXXXXXXXXXoO@.#@@@@@@#.@#ooo+",
"XXXXXXXXXXXXXXXXXXXoO@#.#@@@@#.#@#ooo+",
"XXXXXXXXXXXXXXXXXXXoO@@#.#@@#.#@@#ooo+",
"XXXXXXXXXXXXXXXXXXXoO@@@#.##.#@@@#ooo+",
"XXXXXXXXXXXXXXXXXXXoO@@@@#..#@@@@#ooo+",
"XXXXXXXXXXXXXXXXXXXoO@@@@#..#@@@@#ooo+",
"XXXXXXXXXXXXXXXXXXXoO@@@#.##.#@@@#ooo+",
"XXXXXXXXXXXXXXXXXXXoO@@#.#@@#.#@@#ooo+",
"XXXXXXXXXXXXXXXXXXXoO@#.#@@@@#.#@#ooo+",
"XXXXXXXXXXXXXXXXXXXoO@.#@@@@@@#.@#ooo+",
"XXXXXXXXXXXXXXXXXXXoO@@@@@@@@@@@@#ooo+",
"XXXXXXXXXXXXXXXXXXXoO#############ooo+",
"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo+",
"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo+",
"+++++++++++++++++++++++++++++++++++++.",
"......................................",
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$.",
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$.",
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$.",
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$.",
"##################################O$$.",
".................................$O$$.",
"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$.",
"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$.",
"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$.",
"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$.",
"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$."};
static char * oldstyle_xpm[] = {
"37 33 15 1",
" c None",
". c #747474",
"+ c #757575",
"@ c #000000",
"# c #222222",
"$ c #262626",
"% c #282828",
"& c #FFFFFF",
"* c #080808",
"= c #A5A5A5",
"- c #535353",
"; c #060606",
"> c #070707",
", c #030303",
"' c #ABABAB",
"..................+++++++...........@",
"##################$$$$$$$%$%$$$$$$$$@",
"##################$$$$$$$$%%%%%%%%%%@",
"##################$$$$$$$%$%%%%%%%%%@",
"##################$&&&&&&&&&&&&&&%%%*",
"##################$&============-%%%*",
"##################$&=@-======-@=-%%%*",
"##################$&=-@-====-@-=-%%%*",
"##################$&==-@-==-@-==-%%%*",
"##################$&===-@--@-===-%%%*",
"##################$&====-@@-====-%%%*",
"##################$&====-@@-====-%%%*",
"##################$&===-@--@-===-%%%*",
"##################$&==-@-==-@-==-%%%*",
"##################$&=-@-====-@-=-%%%*",
"##################$&=@-======-@=-%%%*",
"##################$&============-%%%*",
"##################$&-------------%%%*",
"##################$$$$$$$$$%%%%%%%%%*",
"##################$$$$$$$%$%%%%%%%%%*",
";;;;;;;;;;;;;;;;;;>>>>>>>>>>>>>*****,",
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
"''''''''''''''''''''''''''''''''''''@",
"''''''''''''''''''''''''''''''''''''@",
"''''''''''''''''''''''''''''''''''''@",
"''''''''''''''''''''''''''''''''''''@",
"---------------------------------&''@",
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'&''@",
"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&'&''@",
"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&'&''@",
"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&'&''@",
"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&'&''@",
"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&'&''@"};