updated dialogs etc ...

KeithDHedger · KeithDHedger · commit e0c44b54fe29 · 2025-07-05T17:53:56.000+01:00
diff --git a/LFSApplications/ChangeLog b/LFSApplications/ChangeLog
@@ -1,4 +1,6 @@
 0.2.0
+added clolour chooser desktop file.
+Fixed dialogs.
 Updated lfstrayprefs.
 Added lfstrayprefs.
 Updated lfswm2prefs.
diff --git a/LFSApplications/LFSApplications/resources/desktopdata/lfscolourchooser.desktop b/LFSApplications/LFSApplications/resources/desktopdata/lfscolourchooser.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=LFS Colour Chooser
+Comment=LFS Colour Chooser Dialog
+Terminal=false
+Type=Application
+Categories=Graphics;Gnome;GTK;
+Icon=preferences-desktop-theme
+Exec=lfscolourchooser
diff --git a/LFSApplications/LFSApplications/src/lfsabout.cpp b/LFSApplications/LFSApplications/src/lfsabout.cpp
@@ -51,20 +51,17 @@ bool doQuit(void *p,void* ud)
 int main(int argc, char **argv)
 {
 	XEvent				event;
-	windowInitStruct		*win;
 	int					sy=BORDER;
 	int					dw=WINDOWWIDTH;
 	
 	apc=new LFSTK_applicationClass();
 
-	win=apc->LFSTK_getDefaultWInit();
-	win->windowName=BOXLABEL;
-	win->windowType=win->app->appAtomsHashed.at(LFSTK_UtilityClass::LFSTK_hashFromKey("_NET_WM_WINDOW_TYPE_DIALOG"));
-	win->level=ABOVEALL;
-	
-	apc->LFSTK_addWindow(win,BOXLABEL);
+	apc->LFSTK_getDefaultWInit();
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSAbout");
 	wc=apc->mainWindow;
-
+	wc->LFSTK_setKeepAbove(true);
+	wc->LFSTK_setDecorations(false,false,false,true);
+	
 	tux=new LFSTK_imageClass(wc,NULL,WINDOWMIDDLE-(IMAGESIZE/2),sy,IMAGESIZE,IMAGESIZE,BUTTONGRAV,true);
 	tux->LFSTK_setImageFromPath("/usr/share/pixmaps/LFSTux.png",AUTO,true);
 	tux->LFSTK_clearWindow();
@@ -102,9 +99,6 @@ int main(int argc, char **argv)
 	sy+=SPACING+16;
 
 	wc->LFSTK_resizeWindow(dw,sy,true);
-	wc->LFSTK_showWindow();
-	tux->LFSTK_clearWindow();
-
 	int retval=apc->LFSTK_runApp();
 
 	delete apc;
diff --git a/LFSApplications/LFSApplications/src/lfsappearance.cpp b/LFSApplications/LFSApplications/src/lfsappearance.cpp
@@ -277,10 +277,15 @@ int main(int argc, char **argv)
 	int					sx=BORDER;
 	char					*buffer=NULL;
 	std::vector<hitRect>	hrs;
+	//windowInitStruct		*win;
 
-	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKPrefs");
+	apc=new LFSTK_applicationClass();	
+	apc->LFSTK_getDefaultWInit();
+
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSAppearance");
 	wc=apc->mainWindow;
+	wc->LFSTK_setKeepAbove(true);
+	wc->LFSTK_setDecorations(false,false,false,true);
 
 	multi=new LFSTK_ExpanderGadgetClass(wc,"",0,0,1,1);
 	multi->stretchX=false;
@@ -436,8 +441,8 @@ int main(int argc, char **argv)
 	multi->LFSTK_setHitRects(hrs);
 
 	wc->LFSTK_resizeWindow(BORDER*3+GADGETWIDTH+LABELWIDTH,sy,true);
-	wc->LFSTK_showWindow();
-	wc->LFSTK_setKeepAbove(true);
+	//wc->LFSTK_showWindow();
+	//wc->LFSTK_setKeepAbove(true);
 
 	if((queueID=msgget(atoi(key->LFSTK_getCStr()),IPC_CREAT|0660))==-1)
 		fprintf(stderr,"Can't create message queue :( ...\n");
diff --git a/LFSApplications/LFSApplications/src/lfsbackdropprefs.cpp b/LFSApplications/LFSApplications/src/lfsbackdropprefs.cpp
@@ -257,8 +257,11 @@ int main(int argc, char **argv)
 	option			longOptions[]={{"window",1,0,'w'},{0, 0, 0, 0}};
 
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKPrefs");
+	apc->LFSTK_getDefaultWInit();
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSBackdropPrefs");
 	wc=apc->mainWindow;
+	wc->LFSTK_setKeepAbove(true);
+	wc->LFSTK_setDecorations(false,false,false,true);
 
 	cliprefs.prefsMap=
 		{
@@ -392,8 +395,8 @@ int main(int argc, char **argv)
 	sy+=YSPACING;
 
 	wc->LFSTK_resizeWindow(DIALOGWIDTH,sy,true);
-	wc->LFSTK_showWindow();
-	wc->LFSTK_setKeepAbove(true);
+	//wc->LFSTK_showWindow();
+	//wc->LFSTK_setKeepAbove(true);
 	if(parentWindow!=-1)
 		wc->LFSTK_setTransientFor(parentWindow);
 
diff --git a/LFSApplications/LFSApplications/src/lfscolourchooser.cpp b/LFSApplications/LFSApplications/src/lfscolourchooser.cpp
@@ -142,8 +142,11 @@ int main(int argc, char **argv)
 	option			longOptions[]={{"window",1,0,'w'},{0, 0, 0, 0}};
 
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL);
+	apc->LFSTK_getDefaultWInit();
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSColourChooser");
 	wc=apc->mainWindow;
+	wc->LFSTK_setKeepAbove(true);
+	wc->LFSTK_setDecorations(false,false,false,true);
 	
 	cliprefs.prefsMap=
 		{
@@ -240,7 +243,7 @@ int main(int argc, char **argv)
 			wc->LFSTK_setTransientFor(parentWindow);
 		}
 	wc->LFSTK_resizeWindow(DIALOGWIDTH,sy,true);
-	wc->LFSTK_showWindow();
+	//wc->LFSTK_showWindow();
 
 	int retval=apc->LFSTK_runApp();
 
diff --git a/LFSApplications/LFSApplications/src/lfsdesktopprefs.cpp b/LFSApplications/LFSApplications/src/lfsdesktopprefs.cpp
@@ -199,8 +199,11 @@ int main(int argc, char **argv)
 	option			longOptions[]={{"window",1,0,'w'},{0, 0, 0, 0}};
 
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKPrefs");
+	apc->LFSTK_getDefaultWInit();
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSDesktopPrefs");
 	wc=apc->mainWindow;
+	wc->LFSTK_setKeepAbove(true);
+	wc->LFSTK_setDecorations(false,false,false,true);
 
 	cliprefs.prefsMap=
 		{
diff --git a/LFSApplications/LFSApplications/src/lfsdockprefs.cpp b/LFSApplications/LFSApplications/src/lfsdockprefs.cpp
@@ -299,8 +299,11 @@ int main(int argc, char **argv)
 		};
 
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKPrefs");
+	apc->LFSTK_getDefaultWInit();
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSDockPrefs");
 	wc=apc->mainWindow;
+	wc->LFSTK_setKeepAbove(true);
+	wc->LFSTK_setDecorations(false,false,false,true);
 
 	cliprefs.prefsMap=
 		{
@@ -472,8 +475,8 @@ int main(int argc, char **argv)
 	sy+=YSPACING;
 
 	wc->LFSTK_resizeWindow(DIALOGWIDTH,sy,true);
-	wc->LFSTK_showWindow();
-	wc->LFSTK_setKeepAbove(true);
+	//wc->LFSTK_showWindow();
+	//wc->LFSTK_setKeepAbove(true);
 	if(parentWindow!=-1)
 		wc->LFSTK_setTransientFor(parentWindow);
 
diff --git a/LFSApplications/LFSApplications/src/lfsfilechooser.cpp b/LFSApplications/LFSApplications/src/lfsfilechooser.cpp
@@ -56,7 +56,7 @@ int main(int argc, char **argv)
 	parentWindow=prefs.LFSTK_getInt("window");
 	showFolder=prefs.LFSTK_getBool("folder");
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,"");
+	apc->LFSTK_addWindow(NULL,"","LFSFileChooser");
 	wc=apc->mainWindow;
 
 	asprintf(&wd,"%s",apc->userHome.c_str());
diff --git a/LFSApplications/LFSApplications/src/lfsmimeeditor.cpp b/LFSApplications/LFSApplications/src/lfsmimeeditor.cpp
@@ -288,8 +288,11 @@ int main(int argc, char **argv)
 	workDir=mkdtemp(tempfolder);
 
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,"Mime Editor");
+	apc->LFSTK_getDefaultWInit();
+	apc->LFSTK_addWindow(NULL,"Mime Editor","LFSMimeEditor");
 	wc=apc->mainWindow;
+	//wc->LFSTK_setKeepAbove(true);
+	wc->LFSTK_setDecorations(false,false,false,true);
 
 	copyrite=new LFSTK_labelClass(wc,COPYRITE,BORDER,sy,2*DIALOGWIDTH-BORDER-BORDER,GADGETHITE);
 	sy+=HALFYSPACING;
@@ -366,7 +369,7 @@ int main(int argc, char **argv)
 	sy+=(YSPACING/2);
 
 	wc->LFSTK_resizeWindow(DIALOGWIDTH*2,sy,true);
-	wc->LFSTK_showWindow();
+	//wc->LFSTK_showWindow();
 
 	int retval=apc->LFSTK_runApp();
 
diff --git a/LFSApplications/LFSApplications/src/lfspanelprefs.cpp b/LFSApplications/LFSApplications/src/lfspanelprefs.cpp
@@ -274,8 +274,11 @@ int main(int argc, char **argv)
 	option			longOptions[]={{"window",1,0,'w'},{0, 0, 0, 0}};
 
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKPrefs");
+	apc->LFSTK_getDefaultWInit();
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSPanelPrefs");
 	wc=apc->mainWindow;
+	wc->LFSTK_setKeepAbove(true);
+	wc->LFSTK_setDecorations(false,false,false,true);
 
 	cliprefs.prefsMap=
 		{
@@ -482,8 +485,8 @@ int main(int argc, char **argv)
 	sy+=YSPACING;
 
 	wc->LFSTK_resizeWindow(DIALOGWIDTH,sy,true);
-	wc->LFSTK_showWindow();
-	wc->LFSTK_setKeepAbove(true);
+	//wc->LFSTK_showWindow();
+	//wc->LFSTK_setKeepAbove(true);
 	if(parentWindow!=-1)
 		wc->LFSTK_setTransientFor(parentWindow);
 
diff --git a/LFSApplications/LFSApplications/src/lfsruncommand.cpp b/LFSApplications/LFSApplications/src/lfsruncommand.cpp
@@ -76,7 +76,7 @@ bool select(void *object,void* ud)
 
 int main(int argc, char **argv)
 {
-	windowInitStruct		*win;
+	//windowInitStruct		*win;
 	XEvent				event;
 	int 				sy=0;
 	LFSTK_buttonClass	*quit;
@@ -86,15 +86,18 @@ int main(int argc, char **argv)
 
 	apc=new LFSTK_applicationClass();
 
-	win=apc->LFSTK_getDefaultWInit();
-	win->windowName=BOXLABEL;
-	win->windowType=win->app->appAtomsHashed.at(LFSTK_UtilityClass::LFSTK_hashFromKey("_NET_WM_WINDOW_TYPE_DIALOG"));
-	win->level=ABOVEALL;
+	//win=apc->LFSTK_getDefaultWInit();
+	//win->windowName=BOXLABEL;
+	//win->windowType=win->app->appAtomsHashed.at(LFSTK_UtilityClass::LFSTK_hashFromKey("_NET_WM_WINDOW_TYPE_DIALOG"));
+	//win->level=ABOVEALL;
 	
-	apc->LFSTK_addWindow(win,BOXLABEL);
+	apc->LFSTK_getDefaultWInit();
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSRunCommand");
 
 //	apc->LFSTK_addWindow(NULL,"Run Application");
 	wc=apc->mainWindow;
+	wc->LFSTK_setKeepAbove(true);
+	wc->LFSTK_setDecorations(false,false,false,true);
 
 	copyrite=new LFSTK_labelClass(wc,COPYRITE,BORDER,sy,DIALOGWIDTH-BORDER-BORDER,GADGETHITE);
 	sy+=HALFYSPACING;
@@ -135,8 +138,8 @@ int main(int argc, char **argv)
 	sy+=GADGETHITE+BORDER;
 
 	wc->LFSTK_resizeWindow(DIALOGWIDTH,sy,true);
-	wc->LFSTK_showWindow();
-	wc->LFSTK_setKeepAbove(true);
+	//wc->LFSTK_showWindow();
+	//wc->LFSTK_setKeepAbove(true);
 
 	int retval=apc->LFSTK_runApp();
 
diff --git a/LFSApplications/LFSApplications/src/lfstkprefs.cpp b/LFSApplications/LFSApplications/src/lfstkprefs.cpp
@@ -623,6 +623,8 @@ int main(int argc, char **argv)
 	apc=new LFSTK_applicationClass();
 	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKPrefs");
 	wc=apc->mainWindow;
+	wc->LFSTK_setKeepAbove(true);
+	wc->LFSTK_setDecorations(false,false,false,true);
 
 	cliprefs.prefsMap=
 		{
@@ -816,8 +818,6 @@ int main(int argc, char **argv)
 
 	setPreviewData();
 	wc->LFSTK_resizeWindow(DIALOGWIDTH+BORDER,sy,true);
-	wc->LFSTK_showWindow();
-	wc->LFSTK_setKeepAbove(true);
 	if(parentWindow!=-1)
 		wc->LFSTK_setTransientFor(parentWindow);
 
diff --git a/LFSApplications/LFSApplications/src/lfstrayprefs.cpp b/LFSApplications/LFSApplications/src/lfstrayprefs.cpp
@@ -141,8 +141,11 @@ int main(int argc, char **argv)
 		};
 
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKPrefs");
+	apc->LFSTK_getDefaultWInit();
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTrayPrefs");
 	wc=apc->mainWindow;
+	wc->LFSTK_setKeepAbove(true);
+	wc->LFSTK_setDecorations(false,false,false,true);
 
 	bffr=wc->globalLib->LFSTK_oneLiner("sed -n '2p' %S/lfsappearance.rc",apc->configDir);
 	if((queueID=msgget(std::stoi(bffr,nullptr,10),IPC_CREAT|0660))==-1)
@@ -243,7 +246,8 @@ int main(int argc, char **argv)
 	tileFilepath=new LFSTK_buttonClass(wc,"Background",sx,sy,GADGETWIDTH,GADGETHITE,BUTTONGRAV);
 	tileFilepath->LFSTK_setMouseCallBack(NULL,buttonCB,(void*)"SELECTIMAGE");
 	sx+=GADGETWIDTH+BORDER;
-	tileFilepathEdit=new LFSTK_lineEditClass(wc,prefs.LFSTK_getCString("filepath"),sx,sy,EDITBOXWIDTH*2+BORDER,GADGETHITE,BUTTONGRAV);
+	//tileFilepathEdit=new LFSTK_lineEditClass(wc,prefs.LFSTK_getCString("filepath"),sx,sy,EDITBOXWIDTH*2-BORDER-100,GADGETHITE,BUTTONGRAV);
+	tileFilepathEdit=new LFSTK_lineEditClass(wc,prefs.LFSTK_getCString("filepath"),sx,sy,EDITBOXWIDTH,GADGETHITE,BUTTONGRAV);
 	sy+=YSPACING;
 	sx=BORDER;
 
@@ -264,8 +268,8 @@ int main(int argc, char **argv)
 	sy+=YSPACING;
 
 	wc->LFSTK_resizeWindow(DIALOGWIDTH,sy,true);
-	wc->LFSTK_showWindow();
-	wc->LFSTK_setKeepAbove(true);
+	//wc->LFSTK_showWindow();
+	//wc->LFSTK_setKeepAbove(true);
 	if(parentWindow!=-1)
 		wc->LFSTK_setTransientFor(parentWindow);
 
diff --git a/LFSApplications/LFSApplications/src/lfswm2prefs.cpp b/LFSApplications/LFSApplications/src/lfswm2prefs.cpp
@@ -24,7 +24,7 @@
 
 #define MAXMENUS			5
 #define EDITBOXWIDTH		GADGETWIDTH*4
-#define BOXLABEL			"LFS WM Prefs"
+#define BOXLABEL			"LFS WM2 Prefs"
 #define COLOURBUTTONS	3
 #define RESIZEMENUSIZE	2
 #define TITLEPOSMENUSIZE	3
@@ -97,7 +97,7 @@ LFSTK_menuClass			*modkeys1Menu=NULL;
 //modkeys 2
 LFSTK_buttonClass		*modkeys2WindowMenu=NULL;
 LFSTK_lineEditClass		*modkeys2WindowEdit=NULL;
-infoDataStruct				**modkeys2Menus;
+infoDataStruct			**modkeys2Menus;
 const char				*modkeys2MenuNames[]={"Mod1","Mod2","Mod3","Mod4","Mod5"};
 LFSTK_menuClass			*modkeys2Menu=NULL;
 
@@ -374,8 +374,11 @@ int main(int argc, char **argv)
 
 	asprintf(&envFile,"%s/lfswm2.rc",apc->configDir.c_str());
 	prefs.LFSTK_loadVarsFromFile(envFile);
-	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKPrefs");
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSWM2Prefs");
+	apc->LFSTK_getDefaultWInit();
 	wc=apc->mainWindow;
+	wc->LFSTK_setKeepAbove(true);
+	wc->LFSTK_setDecorations(false,false,false,true);
 
 	bffr=wc->globalLib->LFSTK_oneLiner("sed -n '2p' %S/lfsappearance.rc",apc->configDir);
 	if((queueID=msgget(std::stoi(bffr,nullptr,10),IPC_CREAT|0660))==-1)
@@ -618,7 +621,7 @@ int main(int argc, char **argv)
 	mk2=prefs.LFSTK_getInt("modkeys")&0xf8;
 
 	prefsModkeys1Temp=prefs.LFSTK_getInt("modkeys");
-	modkeys1WindowEdit=new LFSTK_lineEditClass(wc,name.c_str(),sx,sy,EDITBOXWIDTH,GADGETHITE,BUTTONGRAV);
+	modkeys1WindowEdit=new LFSTK_lineEditClass(wc,name.c_str(),sx,sy,EDITBOXWIDTH-GADGETWIDTH-BORDER,GADGETHITE,BUTTONGRAV);
 	sy+=YSPACING;
 	sx=BORDER;
 
@@ -640,12 +643,10 @@ int main(int argc, char **argv)
 	sy+=YSPACING;
 
 	wc->LFSTK_resizeWindow(DIALOGWIDTH,sy,true);
-	wc->LFSTK_showWindow();
-	wc->LFSTK_setKeepAbove(true);
 	if(parentWindow!=-1)
 		wc->LFSTK_setTransientFor(parentWindow);
 
-	printf("Number of gadgets in window=%i\n",wc->LFSTK_gadgetCount());
+	//printf("Number of gadgets in window=%i\n",wc->LFSTK_gadgetCount());
 	int retval=apc->LFSTK_runApp();
 
 	delete themeFolder;
diff --git a/makeall b/makeall
@@ -143,7 +143,7 @@ if [[ $action = "help" ]];then
 fi
 
 if [ $1 = "uninstall" ];then
-	BUILDFOR="$BUILDLFSWMANAGER LFSWM2 LFSDesktop LFSSetWallpaper LFSApplications LFSPanel LFSDock LFSToolKit LFSTray"
+	BUILDFOR=" LFSToolKit $BUILDLFSWMANAGER LFSWM2 LFSDesktop LFSSetWallpaper LFSApplications LFSPanel LFSDock LFSTray"
 fi
 
 for app in $BUILDFOR
