mirror of
https://github.com/gryf/wmaker.git
synced 2026-02-13 04:15:50 +01:00
GNOME mouseclickproxy thing fix
added WorkspaceNameDisplayPosition balloon updates bug fixes
This commit is contained in:
@@ -92,6 +92,7 @@ showData(_Panel *panel)
|
||||
WMSetButtonSelected(panel->ballB[0], GetBoolForKey("WindowTitleBalloons"));
|
||||
WMSetButtonSelected(panel->ballB[1], GetBoolForKey("MiniwindowTitleBalloons"));
|
||||
WMSetButtonSelected(panel->ballB[2], GetBoolForKey("AppIconBalloons"));
|
||||
WMSetButtonSelected(panel->ballB[3], GetBoolForKey("HelpBalloons"));
|
||||
}
|
||||
|
||||
|
||||
@@ -136,6 +137,7 @@ storeData(_Panel *panel)
|
||||
SetBoolForKey(WMGetButtonSelected(panel->ballB[0]), "WindowTitleBalloons");
|
||||
SetBoolForKey(WMGetButtonSelected(panel->ballB[1]), "MiniwindowTitleBalloons");
|
||||
SetBoolForKey(WMGetButtonSelected(panel->ballB[2]), "AppIconBalloons");
|
||||
SetBoolForKey(WMGetButtonSelected(panel->ballB[3]), "HelpBalloons");
|
||||
}
|
||||
|
||||
|
||||
@@ -187,7 +189,7 @@ createPanel(Panel *p)
|
||||
WMMoveWidget(panel->ballF, 270, 10);
|
||||
WMSetFrameTitle(panel->ballF, _("Show balloon text for..."));
|
||||
|
||||
for (i=0; i<3; i++) {
|
||||
for (i=0; i<4; i++) {
|
||||
panel->ballB[i] = WMCreateSwitchButton(panel->ballF);
|
||||
WMResizeWidget(panel->ballB[i], 205, 20);
|
||||
WMMoveWidget(panel->ballB[i], 15, 25+i*30);
|
||||
@@ -195,15 +197,15 @@ createPanel(Panel *p)
|
||||
WMSetButtonText(panel->ballB[0], _("incomplete window titles"));
|
||||
WMSetButtonText(panel->ballB[1], _("miniwindow titles"));
|
||||
WMSetButtonText(panel->ballB[2], _("application/dock icons"));
|
||||
/* WMSetButtonText(panel->ballB[3], "help");*/
|
||||
WMSetButtonText(panel->ballB[3], _("internal help"));
|
||||
|
||||
WMMapSubwidgets(panel->ballF);
|
||||
|
||||
|
||||
/***************** Options ****************/
|
||||
panel->optF = WMCreateFrame(panel->frame);
|
||||
WMResizeWidget(panel->optF, 485, 75);
|
||||
WMMoveWidget(panel->optF, 20, 145);
|
||||
|
||||
|
||||
panel->raisB = WMCreateSwitchButton(panel->optF);
|
||||
WMResizeWidget(panel->raisB, 440, 20);
|
||||
WMMoveWidget(panel->raisB, 20, 15);
|
||||
|
||||
@@ -75,7 +75,9 @@ typedef struct _WPrefs {
|
||||
WMButton *closeBtn;
|
||||
WMButton *undoBtn;
|
||||
WMButton *undosBtn;
|
||||
|
||||
|
||||
WMButton *balloonBtn;
|
||||
|
||||
WMFrame *banner;
|
||||
WMLabel *nameL;
|
||||
WMLabel *versionL;
|
||||
@@ -215,7 +217,7 @@ static void
|
||||
prepareForClose()
|
||||
{
|
||||
int i;
|
||||
|
||||
|
||||
for (i=0; i<WPrefs.sectionCount; i++) {
|
||||
PanelRec *rec = WMGetHangedData(WPrefs.sectionB[i]);
|
||||
|
||||
@@ -226,6 +228,19 @@ prepareForClose()
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
toggleBalloons(WMWidget *w, void *data)
|
||||
{
|
||||
WMUserDefaults *udb = WMGetStandardUserDefaults();
|
||||
Bool flag;
|
||||
|
||||
flag = WMGetButtonSelected(WPrefs.balloonBtn);
|
||||
|
||||
WMSetBalloonEnabled(WMWidgetScreen(WPrefs.win), flag);
|
||||
|
||||
WMSetUDBoolForKey(udb, flag, "BalloonHelp");
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
createMainWindow(WMScreen *scr)
|
||||
@@ -280,7 +295,21 @@ createMainWindow(WMScreen *scr)
|
||||
WMMoveWidget(WPrefs.closeBtn, 425, 350);
|
||||
WMSetButtonText(WPrefs.closeBtn, _("Close"));
|
||||
WMSetButtonAction(WPrefs.closeBtn, quit, NULL);
|
||||
|
||||
|
||||
|
||||
WPrefs.balloonBtn = WMCreateSwitchButton(WPrefs.win);
|
||||
WMResizeWidget(WPrefs.balloonBtn, 200, 28);
|
||||
WMMoveWidget(WPrefs.balloonBtn, 15, 350);
|
||||
WMSetButtonText(WPrefs.balloonBtn, _("Balloon Help"));
|
||||
WMSetButtonAction(WPrefs.balloonBtn, toggleBalloons, NULL);
|
||||
{
|
||||
WMUserDefaults *udb = WMGetStandardUserDefaults();
|
||||
Bool flag = WMGetUDBoolForKey(udb, "BalloonHelp");
|
||||
|
||||
WMSetButtonSelected(WPrefs.balloonBtn, flag);
|
||||
WMSetBalloonEnabled(scr, flag);
|
||||
}
|
||||
|
||||
/* banner */
|
||||
WPrefs.banner = WMCreateFrame(WPrefs.win);
|
||||
WMResizeWidget(WPrefs.banner, FRAME_WIDTH, FRAME_HEIGHT);
|
||||
|
||||
@@ -5,7 +5,7 @@ nlsdir = $(NLSDIR)
|
||||
CLEANFILES = $(CATALOGS)
|
||||
|
||||
EXTRA_DIST = pt.po hr.po fr.po ko.po cs.po ja.po zh_TW.Big5.po es.po\
|
||||
zh_CN.po
|
||||
zh_CN.po fi.po
|
||||
|
||||
POTFILES = \
|
||||
$(top_builddir)/WPrefs.app/main.c \
|
||||
|
||||
@@ -94,7 +94,7 @@ nlsdir = $(NLSDIR)
|
||||
|
||||
CLEANFILES = $(CATALOGS)
|
||||
|
||||
EXTRA_DIST = pt.po hr.po fr.po ko.po cs.po ja.po zh_TW.Big5.po es.po zh_CN.po
|
||||
EXTRA_DIST = pt.po hr.po fr.po ko.po cs.po ja.po zh_TW.Big5.po es.po zh_CN.po fi.po
|
||||
|
||||
|
||||
POTFILES = $(top_builddir)/WPrefs.app/main.c $(top_builddir)/WPrefs.app/WPrefs.c $(top_builddir)/WPrefs.app/Appearance.c $(top_builddir)/WPrefs.app/Configurations.c $(top_builddir)/WPrefs.app/Expert.c $(top_builddir)/WPrefs.app/Focus.c $(top_builddir)/WPrefs.app/Icons.c $(top_builddir)/WPrefs.app/KeyboardSettings.c $(top_builddir)/WPrefs.app/KeyboardShortcuts.c $(top_builddir)/WPrefs.app/Menu.c $(top_builddir)/WPrefs.app/MenuPreferences.c $(top_builddir)/WPrefs.app/MouseSettings.c $(top_builddir)/WPrefs.app/NoMenuAlert.c $(top_builddir)/WPrefs.app/Paths.c $(top_builddir)/WPrefs.app/Preferences.c $(top_builddir)/WPrefs.app/Text.c $(top_builddir)/WPrefs.app/TexturePanel.c $(top_builddir)/WPrefs.app/Themes.c $(top_builddir)/WPrefs.app/WindowHandling.c $(top_builddir)/WPrefs.app/Workspace.c $(top_builddir)/WPrefs.app/double.c $(top_builddir)/WPrefs.app/editmenu.c $(top_builddir)/WPrefs.app/MenuGuru.c $(top_builddir)/WPrefs.app/xmodifier.c
|
||||
|
||||
@@ -13,3 +13,4 @@ ja.po Japanese Kazuhide Takahashi <kazu@dgra.ne.jp>
|
||||
zh_TW.Big5.po Chinese Li Wei Jih <lwj83@cs.ccu.edu.tw>
|
||||
zh_CN.po Chinese Wang Jian <wangjian2@asiainfo.com>
|
||||
es.po Spanish Alvaro Herrera <alvherre@webhost.cl>
|
||||
fi.po Finnish Tomi Kajala <tomi@iki.fi>
|
||||
|
||||
1692
WPrefs.app/po/cs.po
1692
WPrefs.app/po/cs.po
File diff suppressed because it is too large
Load Diff
1485
WPrefs.app/po/fi.po
Normal file
1485
WPrefs.app/po/fi.po
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user