Skip to content

Commit e0c44b5

Browse files
KeithDHedgerKeithDHedger
committed
updated dialogs etc ...
1 parent 3baa106 commit e0c44b5

16 files changed

+87
-52
lines changed

‎LFSApplications/ChangeLog

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
0.2.0
2+
added clolour chooser desktop file.
3+
Fixed dialogs.
24
Updated lfstrayprefs.
35
Added lfstrayprefs.
46
Updated lfswm2prefs.

‎LFSApplications/LFSApplications/resources/desktopdata/lfscolourchooser.desktop

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[Desktop Entry]
2+
Name=LFS Colour Chooser
3+
Comment=LFS Colour Chooser Dialog
4+
Terminal=false
5+
Type=Application
6+
Categories=Graphics;Gnome;GTK;
7+
Icon=preferences-desktop-theme
8+
Exec=lfscolourchooser

‎LFSApplications/LFSApplications/src/lfsabout.cpp

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,17 @@ bool doQuit(void *p,void* ud)
5151
int main(int argc, char **argv)
5252
{
5353
XEvent event;
54-
windowInitStruct *win;
5554
int sy=BORDER;
5655
int dw=WINDOWWIDTH;
5756

5857
apc=new LFSTK_applicationClass();
5958

60-
win=apc->LFSTK_getDefaultWInit();
61-
win->windowName=BOXLABEL;
62-
win->windowType=win->app->appAtomsHashed.at(LFSTK_UtilityClass::LFSTK_hashFromKey("_NET_WM_WINDOW_TYPE_DIALOG"));
63-
win->level=ABOVEALL;
64-
65-
apc->LFSTK_addWindow(win,BOXLABEL);
59+
apc->LFSTK_getDefaultWInit();
60+
apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSAbout");
6661
wc=apc->mainWindow;
67-
62+
wc->LFSTK_setKeepAbove(true);
63+
wc->LFSTK_setDecorations(false,false,false,true);
64+
6865
tux=new LFSTK_imageClass(wc,NULL,WINDOWMIDDLE-(IMAGESIZE/2),sy,IMAGESIZE,IMAGESIZE,BUTTONGRAV,true);
6966
tux->LFSTK_setImageFromPath("/usr/share/pixmaps/LFSTux.png",AUTO,true);
7067
tux->LFSTK_clearWindow();
@@ -102,9 +99,6 @@ int main(int argc, char **argv)
10299
sy+=SPACING+16;
103100

104101
wc->LFSTK_resizeWindow(dw,sy,true);
105-
wc->LFSTK_showWindow();
106-
tux->LFSTK_clearWindow();
107-
108102
int retval=apc->LFSTK_runApp();
109103

110104
delete apc;

‎LFSApplications/LFSApplications/src/lfsappearance.cpp

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -277,10 +277,15 @@ int main(int argc, char **argv)
277277
int sx=BORDER;
278278
char *buffer=NULL;
279279
std::vector<hitRect> hrs;
280+
//windowInitStruct *win;
280281

281-
apc=new LFSTK_applicationClass();
282-
apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKPrefs");
282+
apc=new LFSTK_applicationClass();
283+
apc->LFSTK_getDefaultWInit();
284+
285+
apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSAppearance");
283286
wc=apc->mainWindow;
287+
wc->LFSTK_setKeepAbove(true);
288+
wc->LFSTK_setDecorations(false,false,false,true);
284289

285290
multi=new LFSTK_ExpanderGadgetClass(wc,"",0,0,1,1);
286291
multi->stretchX=false;
@@ -436,8 +441,8 @@ int main(int argc, char **argv)
436441
multi->LFSTK_setHitRects(hrs);
437442

438443
wc->LFSTK_resizeWindow(BORDER*3+GADGETWIDTH+LABELWIDTH,sy,true);
439-
wc->LFSTK_showWindow();
440-
wc->LFSTK_setKeepAbove(true);
444+
//wc->LFSTK_showWindow();
445+
//wc->LFSTK_setKeepAbove(true);
441446

442447
if((queueID=msgget(atoi(key->LFSTK_getCStr()),IPC_CREAT|0660))==-1)
443448
fprintf(stderr,"Can't create message queue :( ...\n");

‎LFSApplications/LFSApplications/src/lfsbackdropprefs.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,11 @@ int main(int argc, char **argv)
257257
option longOptions[]={{"window",1,0,'w'},{0, 0, 0, 0}};
258258

259259
apc=new LFSTK_applicationClass();
260-
apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKPrefs");
260+
apc->LFSTK_getDefaultWInit();
261+
apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSBackdropPrefs");
261262
wc=apc->mainWindow;
263+
wc->LFSTK_setKeepAbove(true);
264+
wc->LFSTK_setDecorations(false,false,false,true);
262265

263266
cliprefs.prefsMap=
264267
{
@@ -392,8 +395,8 @@ int main(int argc, char **argv)
392395
sy+=YSPACING;
393396

394397
wc->LFSTK_resizeWindow(DIALOGWIDTH,sy,true);
395-
wc->LFSTK_showWindow();
396-
wc->LFSTK_setKeepAbove(true);
398+
//wc->LFSTK_showWindow();
399+
//wc->LFSTK_setKeepAbove(true);
397400
if(parentWindow!=-1)
398401
wc->LFSTK_setTransientFor(parentWindow);
399402

‎LFSApplications/LFSApplications/src/lfscolourchooser.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,11 @@ int main(int argc, char **argv)
142142
option longOptions[]={{"window",1,0,'w'},{0, 0, 0, 0}};
143143

144144
apc=new LFSTK_applicationClass();
145-
apc->LFSTK_addWindow(NULL,BOXLABEL);
145+
apc->LFSTK_getDefaultWInit();
146+
apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSColourChooser");
146147
wc=apc->mainWindow;
148+
wc->LFSTK_setKeepAbove(true);
149+
wc->LFSTK_setDecorations(false,false,false,true);
147150

148151
cliprefs.prefsMap=
149152
{
@@ -240,7 +243,7 @@ int main(int argc, char **argv)
240243
wc->LFSTK_setTransientFor(parentWindow);
241244
}
242245
wc->LFSTK_resizeWindow(DIALOGWIDTH,sy,true);
243-
wc->LFSTK_showWindow();
246+
//wc->LFSTK_showWindow();
244247

245248
int retval=apc->LFSTK_runApp();
246249

‎LFSApplications/LFSApplications/src/lfsdesktopprefs.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,11 @@ int main(int argc, char **argv)
199199
option longOptions[]={{"window",1,0,'w'},{0, 0, 0, 0}};
200200

201201
apc=new LFSTK_applicationClass();
202-
apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKPrefs");
202+
apc->LFSTK_getDefaultWInit();
203+
apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSDesktopPrefs");
203204
wc=apc->mainWindow;
205+
wc->LFSTK_setKeepAbove(true);
206+
wc->LFSTK_setDecorations(false,false,false,true);
204207

205208
cliprefs.prefsMap=
206209
{

‎LFSApplications/LFSApplications/src/lfsdockprefs.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,8 +299,11 @@ int main(int argc, char **argv)
299299
};
300300

301301
apc=new LFSTK_applicationClass();
302-
apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKPrefs");
302+
apc->LFSTK_getDefaultWInit();
303+
apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSDockPrefs");
303304
wc=apc->mainWindow;
305+
wc->LFSTK_setKeepAbove(true);
306+
wc->LFSTK_setDecorations(false,false,false,true);
304307

305308
cliprefs.prefsMap=
306309
{
@@ -472,8 +475,8 @@ int main(int argc, char **argv)
472475
sy+=YSPACING;
473476

474477
wc->LFSTK_resizeWindow(DIALOGWIDTH,sy,true);
475-
wc->LFSTK_showWindow();
476-
wc->LFSTK_setKeepAbove(true);
478+
//wc->LFSTK_showWindow();
479+
//wc->LFSTK_setKeepAbove(true);
477480
if(parentWindow!=-1)
478481
wc->LFSTK_setTransientFor(parentWindow);
479482

‎LFSApplications/LFSApplications/src/lfsfilechooser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ int main(int argc, char **argv)
5656
parentWindow=prefs.LFSTK_getInt("window");
5757
showFolder=prefs.LFSTK_getBool("folder");
5858
apc=new LFSTK_applicationClass();
59-
apc->LFSTK_addWindow(NULL,"");
59+
apc->LFSTK_addWindow(NULL,"","LFSFileChooser");
6060
wc=apc->mainWindow;
6161

6262
asprintf(&wd,"%s",apc->userHome.c_str());

‎LFSApplications/LFSApplications/src/lfsmimeeditor.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,11 @@ int main(int argc, char **argv)
288288
workDir=mkdtemp(tempfolder);
289289

290290
apc=new LFSTK_applicationClass();
291-
apc->LFSTK_addWindow(NULL,"Mime Editor");
291+
apc->LFSTK_getDefaultWInit();
292+
apc->LFSTK_addWindow(NULL,"Mime Editor","LFSMimeEditor");
292293
wc=apc->mainWindow;
294+
//wc->LFSTK_setKeepAbove(true);
295+
wc->LFSTK_setDecorations(false,false,false,true);
293296

294297
copyrite=new LFSTK_labelClass(wc,COPYRITE,BORDER,sy,2*DIALOGWIDTH-BORDER-BORDER,GADGETHITE);
295298
sy+=HALFYSPACING;
@@ -366,7 +369,7 @@ int main(int argc, char **argv)
366369
sy+=(YSPACING/2);
367370

368371
wc->LFSTK_resizeWindow(DIALOGWIDTH*2,sy,true);
369-
wc->LFSTK_showWindow();
372+
//wc->LFSTK_showWindow();
370373

371374
int retval=apc->LFSTK_runApp();
372375

0 commit comments

Comments
 (0)