1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 12:28:22 +01:00

Remove remaining sound stuff from WPrefs etc

Let's remove the configuration options about "sound" from
WPrefs (as it was never fully functionall anyway) and from
configuration files.

Remove also the xpm and tiff icons.
This commit is contained in:
Carlos R. Mafra
2009-10-12 03:01:46 +02:00
parent c5f027d811
commit a3246cfe3b
8 changed files with 1 additions and 317 deletions

View File

@@ -45,7 +45,6 @@ typedef struct _Panel {
WMFrame *animF;
WMButton *animB;
WMButton *supB;
WMButton *sfxB;
WMLabel *noteL;
WMFrame *smoF;
@@ -66,7 +65,6 @@ typedef struct _Panel {
#define NEWS_IMAGE "newstyle"
#define ANIM_IMAGE "animations"
#define SUPERF_IMAGE "moreanim"
#define SOUND_IMAGE "sound"
#define SMOOTH_IMAGE "smooth"
#define SPEED_IMAGE "speed%i"
#define SPEED_IMAGE_S "speed%is"
@@ -86,7 +84,6 @@ static void showData(_Panel *panel)
WMSetButtonSelected(panel->animB, !GetBoolForKey("DisableAnimations"));
WMSetButtonSelected(panel->supB, GetBoolForKey("Superfluous"));
WMSetButtonSelected(panel->sfxB, !GetBoolForKey("DisableSound"));
WMSetButtonSelected(panel->smoB, GetBoolForKey("SmoothWorkspaceBack"));
WMSetButtonSelected(panel->dithB, GetBoolForKey("DisableDithering"));
WMSetSliderValue(panel->dithS, GetIntegerForKey("ColormapSize"));
@@ -314,7 +311,7 @@ static void createPanel(Panel *p)
panel->animF = WMCreateFrame(panel->box);
WMResizeWidget(panel->animF, 255, 115);
WMMoveWidget(panel->animF, 255, 10);
WMSetFrameTitle(panel->animF, _("Animations and Sound"));
WMSetFrameTitle(panel->animF, _("Animations"));
panel->animB = WMCreateButton(panel->animF, WBTToggle);
WMResizeWidget(panel->animB, 64, 64);
@@ -354,34 +351,6 @@ static void createPanel(Panel *p)
"dock when it's being moved to another side and\n"
"the explosion animation when undocking icons."), WMWidgetView(panel->supB));
panel->sfxB = WMCreateButton(panel->animF, WBTToggle);
WMResizeWidget(panel->sfxB, 64, 64);
WMMoveWidget(panel->sfxB, 175, 20);
WMSetButtonFont(panel->sfxB, font);
WMSetButtonText(panel->sfxB, _("Sounds"));
WMSetButtonImagePosition(panel->sfxB, WIPAbove);
createImages(scr, rc, xis, SOUND_IMAGE, &altIcon, &icon);
if (icon) {
WMSetButtonImage(panel->sfxB, icon);
WMReleasePixmap(icon);
}
if (altIcon) {
WMSetButtonAltImage(panel->sfxB, altIcon);
WMReleasePixmap(altIcon);
}
WMSetBalloonTextForView(_("Disable/enable support for sound effects played\n"
"for actions like shading and closing a window.\n"
"You will need a module distributed separately\n"
"for this. You can get it at:\n"
"http://largo.windowmaker.info/files.php#WSoundServer"),
WMWidgetView(panel->sfxB));
panel->noteL = WMCreateLabel(panel->animF);
WMResizeWidget(panel->noteL, 235, 28);
WMMoveWidget(panel->noteL, 10, 85);
WMSetLabelFont(panel->noteL, font);
WMSetLabelText(panel->noteL, _("Note: sound requires a module distributed\nseparately"));
WMMapSubwidgets(panel->animF);
/*********** Dithering **********/
@@ -459,7 +428,6 @@ static void storeData(_Panel *panel)
SetBoolForKey(WMGetButtonSelected(panel->newsB), "NewStyle");
SetBoolForKey(!WMGetButtonSelected(panel->animB), "DisableAnimations");
SetBoolForKey(WMGetButtonSelected(panel->supB), "Superfluous");
SetBoolForKey(!WMGetButtonSelected(panel->sfxB), "DisableSound");
SetBoolForKey(WMGetButtonSelected(panel->smoB), "SmoothWorkspaceBack");
SetBoolForKey(WMGetButtonSelected(panel->dithB), "DisableDithering");
SetIntegerForKey(WMGetSliderValue(panel->dithS), "ColormapSize");

View File

@@ -32,7 +32,6 @@ EXTRA_DIST = \
opaque.tiff \
paths.tiff \
smooth.tiff \
sound.tiff \
speed0.tiff \
speed0s.tiff \
speed1.tiff \

View File

@@ -33,7 +33,6 @@ EXTRA_DIST = \
opaque.xpm \
paths.xpm \
smooth.xpm \
sound.xpm \
speed0.xpm \
speed0s.xpm \
speed1.xpm \

View File

@@ -4,7 +4,6 @@
Logo.WMClip = {Icon = clip.#extension#;};
Dockit = {Icon = GNUstep.#extension#;};
DockApp = {NoAppIcon = NO;};
WSoundServer = {Icon = sound.#extension#;};
panel.Panel = {NoAppIcon = YES;};
gmc.Gmc = {NoAppIcon = YES;};
XTerm = {Icon = Terminal.#extension#;};

View File

@@ -35,7 +35,6 @@ defsdata_DATA = \
ps.tiff\
real.tiff\
sgiterm.tiff\
sound.tiff\
staroffice2.tiff\
timer.tiff\
wilber.tiff\
@@ -61,7 +60,6 @@ defsdata_DATA = \
ps.xpm\
real.xpm\
sgiterm.xpm\
sound.xpm\
staroffice2.xpm\
timer.xpm\
wilber.xpm\

Binary file not shown.

View File

@@ -1,263 +0,0 @@
/* XPM */
static char * image_name[] = {
"48 48 212 2",
" c #618561856185",
". c #FFFFFFFFFFFF",
"X c #D75CD34CDF7D",
"o c #CF3CCF3CDF7D",
"O c #CF3CCB2BDF7D",
"+ c #C71BC30BDF7D",
"@ c #BEFBBEFBDF7D",
"# c #BEFBBAEADF7D",
"$ c #B6DAB6DADF7D",
"% c #B6DAB2CADF7D",
"& c #AEBAAEBADF7D",
"* c #AEBAAAAADF7D",
"= c #A699A699DF7D",
"- c #A699A289DF7D",
"; c #9E799E79DF7D",
": c #9E799A69DF7D",
"> c #96589658DF7D",
", c #96589248DF7D",
"< c #8E388E38DF7D",
"1 c #8E388A28DF7D",
"2 c #86178617DF7D",
"3 c #C71BC30BCF3C",
"4 c #596555555965",
"5 c #492449244924",
"6 c #492445144103",
"7 c #410341034103",
"8 c #41033CF34103",
"9 c #41033CF338E3",
"0 c #38E338E338E3",
"q c #410338E34103",
"w c #38E334D338E3",
"e c #30C230C230C2",
"r c #61855D7579E7",
"t c #A699A289D75C",
"y c #69A669A669A6",
"u c #20811C711861",
"i c #208118611861",
"p c #208114511861",
"a c #30C22CB228A2",
"s c #86178617AEBA",
"d c #28A21C712081",
"f c #5965596571C6",
"g c #86178207DF7D",
"h c #BEFBBAEAC71B",
"j c #38E334D330C2",
"k c #410338E338E3",
"l c #38E330C230C2",
"z c #28A228A228A2",
"x c #410334D328A2",
"c c #79E771C64103",
"v c #C71BC30B9658",
"b c #E79DDB6C6185",
"n c #F7DEEBAD5144",
"m c #186114511040",
"M c #28A220812081",
"N c #186118611861",
"B c #186114511861",
"V c #28A224921040",
"C c #861779E728A2",
"Z c #AEBAA69938E3",
"A c #E79DDB6C4103",
"S c #FFFFF3CE4924",
"D c #79E77DF7DF7D",
"F c #B6DAB2CAC71B",
"G c #6185596528A2",
"H c #EFBEE79D4924",
"J c #C71BBEFB79E7",
"K c #B6DAAAAAAEBA",
"L c #CF3CC71B4103",
"P c #8E38861738E3",
"I c #61854D342081",
"U c #96589658CF3C",
"Y c #79E779E7DF7D",
"T c #104014511040",
"R c #596555552081",
"E c #20811C712081",
"W c #30C22CB238E3",
"Q c #C71BBEFB9658",
"! c #186110401040",
"~ c #28A2249228A2",
"^ c #514449244924",
"/ c #51444D345144",
"( c #8E388617C71B",
") c #BEFBB6DA9E79",
"_ c #AEBAAAAAC71B",
"` c #618559655965",
"' c #596555551861",
"] c #861775D62081",
"[ c #AEBAA289AEBA",
"{ c #71C675D6DF7D",
"} c #18610C301040",
"| c #492445144924",
" . c #10400C301040",
".. c #28A2249230C2",
"X. c #BEFBB2CA9658",
"o. c #71C669A669A6",
"O. c #8E3886178E38",
"+. c #D75CCF3C79E7",
"@. c #EFBEE38D5965",
"#. c #E79DDF7D6185",
"$. c #71C671C6DF7D",
"%. c #104008201040",
"&. c #861782078617",
"*. c #965879E779E7",
"=. c #30C22CB230C2",
"-. c #38E330C20820",
";. c #D75CBEFB30C2",
":. c #71C675D6D75C",
">. c #A699A289AEBA",
",. c #104010401040",
"<. c #38E32CB21040",
"1. c #D75CCF3C4924",
"2. c #F7DEEFBE4924",
"3. c #8E386DB628A2",
"4. c #EFBECB2B38E3",
"5. c #8E387DF7AEBA",
"6. c #B6DAAEBA9658",
"7. c #69A66DB6DF7D",
"8. c #FFFFD75C2081",
"9. c #79E771C65144",
"0. c #86178617D75C",
"q. c #A6999E79AEBA",
"w. c #A699A699C71B",
"e. c #71C6659538E3",
"r. c #69A669A6DF7D",
"t. c #104008200820",
"y. c #514451445144",
"u. c #596559655965",
"i. c #28A2249238E3",
"p. c #9E79861779E7",
"a. c #61856595DF7D",
"s. c #61855D7569A6",
"d. c #71C671C679E7",
"f. c #79E775D679E7",
"g. c #79E779E7AEBA",
"h. c #71C66DB671C6",
"j. c #28A2208128A2",
"k. c #861782078E38",
"l. c #DF7DCF3C5144",
"z. c #79E775D69658",
"x. c #61856185DF7D",
"c. c #A699A289CF3C",
"v. c #79E779E78617",
"b. c #10400C300820",
"n. c #69A66DB6CF3C",
"m. c #9E799248AEBA",
"M. c #D75CCF3C71C6",
"N. c #86177DF78617",
"B. c #71C671C6C71B",
"V. c #AEBAAAAA9658",
"C. c #E79DDB6C5965",
"Z. c #59655D75DF7D",
"A. c #208120812081",
"S. c #9E799A69A699",
"D. c #86177DF78E38",
"F. c #6185596569A6",
"G. c #38E330C228A2",
"H. c #9E7996584103",
"J. c #69A66595D75C",
"K. c #A699A2899658",
"L. c #59655965DF7D",
"P. c #9E799E79CF3C",
"I. c #69A6618530C2",
"U. c #AEBAA2899658",
"Y. c #DF7DD34C4924",
"T. c #6185618569A6",
"R. c #96589248AEBA",
"E. c #51445555DF7D",
"W. c #596555556185",
"Q. c #965896589E79",
"!. c #8E388A289658",
"~. c #69A669A671C6",
"^. c #B6DAAAAA5965",
"/. c #96588E38AEBA",
"(. c #A6999E799E79",
"). c #49244D345144",
"_. c #861786179658",
"`. c #492445145965",
"'. c #69A6659569A6",
"]. c #79E771C638E3",
"[. c #51445144DF7D",
"{. c #AEBAA28971C6",
"}. c #96588A2838E3",
"|. c #AEBA9E799658",
" X c #861771C69E79",
".X c #61856595D75C",
"XX c #71C66595AEBA",
"oX c #BEFB8E381861",
"OX c #49244D34DF7D",
"+X c #A699A699AEBA",
"@X c #79E775D628A2",
"#X c #DF7DD34C69A6",
"$X c #61855D75BEFB",
"%X c #61855D75AEBA",
"&X c #71C6659528A2",
"*X c #61856595AEBA",
"=X c #59655965D75C",
"-X c #59655144C71B",
";X c #61854D3430C2",
":X c #69A64D340820",
">X c #30C22CB24103",
",X c #69A665959658",
"<X c #49244924DF7D",
"1X c #D75CCB2B4103",
"2X c #49244514DF7D",
"3X c #49244D346185",
"4X c #104004100820",
"5X c #51444D346185",
"6X c #41034103DF7D",
"7X c #71C675D6BEFB",
"8X c #71C671C6CF3C",
"9X c #41033CF3DF7D",
" . ",
" X X X X o o O O O + + + + @ @ @ # # $ $ % % % & & * * * = = - - ; ; ; : : > > , , , < < 1 1 . ",
" X X X o o O O O + + + + @ @ @ # # $ $ % % % & & * * * = = - - - ; ; : : > > , , , < < 1 1 2 . ",
" X X o 3 4 5 5 6 7 8 8 9 0 9 0 0 0 q 0 0 0 0 0 0 w e r t - - ; ; ; : : > > > , , < < 1 1 2 2 . ",
" X o X y u i i i i i p i i i i i i i i i i i i i i i a s - - ; ; : : > > , , , < < 1 1 2 2 2 . ",
" o o 3 u u i i i i i p u i i u i u u u u i u i i u u d f - ; ; : : > > , , , < < 1 1 2 2 2 g . ",
" o O h j 0 0 9 6 9 7 9 0 k j a l j e a a a e e a a z x c v b n : : > , , , < < 1 1 2 2 2 g g . ",
" O O h m d M N B p B B N i i i i p i i i i d V C Z A S S S S S > > , , , < < 1 1 2 2 2 g g D . ",
" O O F m 8 7 N p B N N N i i i i i i i i i i G S S S H J v K v > , , , < < 1 1 2 2 2 g g D D . ",
" O + F m j l m N N N N B B N i N i i i N i i G L P I i a U > v > , , < < 1 1 2 2 2 g g D D Y . ",
" + + F T m T m B i N p N m p M u i B N N N N R C i E i W > > Q , , < < 1 1 2 2 2 g g D D Y Y . ",
" + + F m m m m m ! m B m ~ 6 ^ / 5 ~ B B N B R C N N i W > , Q , < < ( ) 2 2 2 g g D D Y Y Y . ",
" + + _ T ! m ! m m m m d 9 ^ 4 ` ^ 8 ~ m m m ' ] N N i W , , Q < < < [ S 2 2 g g D D Y Y Y { . ",
" + @ _ } m ! m m m ! T 9 6 ^ 9 e ^ 5 | T ! m ' ] ! N N W , , Q < 1 1 [ b 2 g g D D Y Y Y { { . ",
" @ @ _ T ! .! ! ! ! T 6 6 ^ 0 j j / 5 ! ! m ' ] m m N .., < Q 1 1 1 [ X.g g D D Y Y Y { { { . ",
" @ @ _ .! ! ! m .m } 6 6 o.K O./ | | m m m ' ] T m m I +.@.#.1 2 2 [ X.g D D Y Y Y { { $.$.. ",
" @ # _ T m .! .! m %.z ^ 4 &.*.^ ^ =.m B m G ] i m -.S S S ;.:.1 g >.X.D D Y Y Y { { { $.$.. ",
" # # _ .m .m m .m } T a ^ ^ ^ 6 a ,.<.1.2.S 3.9 } V 2.S 4.5.2 2 g >.6.D Y Y Y { { $.$.$.7.. ",
" # $ _ . . . . .,.} } } ,.u l l d m m L S S 8.9.6 T m a ( 0.g g g g q.6.Y Y Y { { { $.$.7.7.. ",
" $ $ w. .} %. .} ,. . .} } } } .%.m m ] A 4.e.` e m m ..2 2 2 g g D q.6.Y Y { { $.$.$.7.7.r.. ",
" $ % w. .t. . .,.,.} t.} z y. / w N .T . .T T ! m ..2 2 g g D D [ 6.Y { { { $.$.7.7.r.r.. ",
" % % w.t. .t.} T . .z 4 ^ y.u.u.` / u.y.u } m m .! m i.2 g g 5.b 2.S p.{ { $.$.$.7.7.r.r.a.. ",
" % % w.t. .%. . .} w 5 s.&.&.d.y d.&.f.4 4 z .m m .m ..g g D b S S 8.g.{ { $.$.7.7.r.r.a.a.. ",
" % & w.t.%. .t.} e ^ &.h.l ~ M j.d j.7 k.y 7 i T ,. .m ..g D D X.@.l.z.{ $.$.$.7.7.r.r.r.a.a.. ",
" & & w.t.} %.t.z 8 k.^ a z z z ~ ~ j.~ u y y 0 B } ! ,...D D Y Y Y Y { $.$.$.7.7.r.r.a.a.a.x.. ",
" & * c.t. .t.N j v./ =.a a ~ M M M j.j.~ M d.5 =.b.m m ..D Y Y Y { { { $.$.7.n.m.6.M.n a.x.x.. ",
" * * c.} .t.z 5 h.l =.a ~ M l 9 ~ M j.~ ~ j.N.9 N m ...Y Y Y { { { B.V.v C.S S S S S x.x.Z.. ",
" * * c.} .T w d.8 l =.a A.=.k.S.v.M j.~ z u h.7 A.} ,...Y Y { { { $.m.S S S n M.V.5.V.x.Z.Z.. ",
" * = c.} .i 8 N.a =.e e i =.s.D.F.~ d j.~ G.H. a } ,...Y { { { $.$.m.b V.5.J.a.a.x.K.x.Z.L.. ",
" = = P.} .u 6 v.=.=.W =.B u e 8 =.i M ~ ~ I.S y l } m ..{ { $.$.$.7.m.U.r.a.a.a.x.x.K.Z.Z.L.. ",
" = - c.} } E 6 k.W e 0 q ~ B M j.i E ~ ~ ~ I.Y.T.l ,.T ..{ { $.$.7.7.m.U.r.a.a.x.x.x.K.L.L.L.. ",
" - - P.T %.i | D.e q 8 | 4 8 m ,.~ 0 =.a z I.H.u.a T ! ..$.$.$.7.7.r.R.U.a.a.x.x.Z.Z.K.L.L.E.. ",
" - - P.T m B 8 d.4 8 | / W.v.Q.!.~.7 q e a G ^.8 M m m ..$.$.7.7.r.r./.U.a.x.x.Z.Z.L.(.L.E.E.. ",
" - ; P.T ! } =.)._.`./ 4 '.~.~.~.W.| 8 w j ].^.l N m m ..$.7.7.r.r.a./.U.x.x.Z.Z.Z.L.(.E.E.[.. ",
" ; ; P.T m } d 5 v.d.W.F.y ~.'.'.s./ 6 8 q {.}.a ! B m i.7.7.r.r.a.a./.|.x.Z.Z. XJ C.b E.[.[.. ",
" ; : P.m m m } =.0 !.!.d.~.'.'.s.F.W.).).z.H.}.i N N B i.7.r.r.r.a..XR.|.Z.Z.XXS S S oX[.[.OX. ",
" : : P.m ! m } ! e 9 f.+X!.v.v.h.h.~.v._.4 e.@Xm m m m i.r.r.a.XX#X2.S *.Z.L.$X2.S 4.%X[.OXOX. ",
" : > U . .t.} ,.p j j 6 N.S.S.R.S._.'.6 0 &X] m m m m i.r.r.a.b S S 8.*XL.L.L.=X-X[.[.OXOXOX. ",
" > > U ,.%.t.t. .%.m z k a j 6 ^ 7 7 ;XL 2.S :XT ! ! T >Xa.a.a.|.@.l.,XL.L.L.E.E.[.[.OXOXOX<X. ",
" > , P. .%.%.%.t.} .} B u a l l a A.1XS S 8.V ! m ! ! `.a.a.x.x.Z.Z.Z.L.L.E.E.[.[.OXOXOX<X<X. ",
" , , U T t.%.t.t.%.} t.} } t.t.} t.} @XA ;.-. .m ! ! m `.a.x.x.Z.Z.L.L.L.E.E.[.[.OXOXOX<X<X2X. ",
" , , U } %.t.%.%.t.t.t.t.%.} T } } } b.b.} ,.! .! m m 3Xx.x.Z.Z.L.L.L.E.E.[.[.OXOXOX<X<X2X2X. ",
" , < U ! m ! t.t.t.t.4Xt.%.%.%.} t. .b.T m ! ! ! p p m 5Xx.Z.Z.L.L.L.E.E.[.[.OXOXOX<X<X2X2X6X. ",
" < < U } i ! b.t.t.%.t.%. .%.t.%.%.t.t.} . .! m i ! p 5XZ.Z.Z.L.L.E.E.[.[.OXOXOX<X<X2X2X6X6X. ",
" < 1 U m } } t.t.4X4Xt.4X4Xt.t.t.} %.} } } ! .p } ! T 5XZ.L.L.L.E.E.[.[.OXOXOX<X<X2X2X6X6X6X. ",
" 1 1 < 7X7X7X7X7X7X7X7X7XB.7XB.B.B.B.8XB.8X8X8X8X8X8X8X$.Z.L.L.E.E.[.[.OXOXOX<X<X2X2X6X6X6X9X. ",
" 1 2 2 2 g g g D Y Y { { { $.$.$.$.7.r.r.r.a.a.x.x.Z.Z.L.L.L.E.E.[.[.OXOXOX<X<X2X2X6X6X6X9X9X. ",
". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . "};

View File

@@ -217,22 +217,6 @@ else
fi
if [ ! -d "$GSDIR/Library/WindowMaker/Sounds" ]; then
echo "Creating sound library $GSDIR/Library/WindowMaker/Sounds"
make_dir $GSDIR/Library/WindowMaker/Sounds
else
echo "Default Sounds directory already exists. Skipping..."
fi
if [ ! -d "$GSDIR/Library/WindowMaker/SoundSets" ]; then
echo "Creating sound set library $GSDIR/Library/WindowMaker/SoundSets"
make_dir $GSDIR/Library/WindowMaker/SoundSets
else
echo "Default SoundSets directory already exists. Skipping..."
fi
if [ ! -d "$GSDIR/Library/WindowMaker/CachedPixmaps" ]; then
make_dir $GSDIR/Library/WindowMaker/CachedPixmaps
fi