WebSVN – Kolibri OS – Diff – /programs/cmm/appearance/appearance.c

 //                                                   //
 //                       DATA                        //
 //                                                   //
 //===================================================//
+int active_skin, active_wallpaper, active_screensaver;
 signed int active_skin=-1, active_wallpaper=-1, active_screensaver=-1;
 enum {
 	BASE_TAB_BUTTON_ID=3,
 	BTN_SELECT_WALLP_FOLDER=10,
 	BTN_TEST_SCREENSAVER };
 char folder_path[4096];
+char cur_file_path[4096];
+char cur_skin_path[4096];
-char cur_file_path[4096];
+char default_skin[4096];
-char cur_skin_path[4096];
+char default_wallp[4096];
 char ss_available[200];
 int screensaver_timeout;
 _tabs tabs = { -sizeof(t_skins)-sizeof(t_wallpapers)-sizeof(t_screensaver)-3*8+WIN_W
-_tabs tabs = { -sizeof(t_skins)-sizeof(t_wallpapers)-sizeof(t_screensaver)-3*8+WIN_W
+	 - TAB_PADDING / 2, LP, NULL, BASE_TAB_BUTTON_ID };
 	 - TAB_PADDING / 2, LP, NULL, BASE_TAB_BUTTON_ID };
 	load_dll(libini, #lib_init,1);
 	load_dll(Proc_lib, #OpenDialog_init,0);
 	o_dialog.type = 2; //select folder
 	OpenDialog_init stdcall (#o_dialog);
+	GetIniSettings();
 	tabs.add(#t_skins, #EventTabSkinsClick);
 	tabs.add(#t_wallpapers, #EventTabWallpappersClick);
 	tabs.add(#t_screensaver, #EventTabScreensaverClick);
-	tabs.draw_active_tab();
-	GetScreensaverIniSettings();
+	tabs.draw_active_tab();
 	SetEventMask(EVM_REDRAW + EVM_KEY + EVM_BUTTON + EVM_MOUSE + EVM_MOUSE_FILTER);
 	loop() switch(WaitEvent())
+	{
 		optionbox_auto.draw(RIGHTx+14, PANEL_H+79);
 		DrawStandartCaptButton(RIGHTx, PANEL_H+130, BTN_SELECT_WALLP_FOLDER, T_SELECT_FOLDER);
+	}
 	if (tabs.active_tab == TAB_SCREENSAVERS)
+	{
-		DrawStandartCaptButton(RIGHTx, PANEL_H, BTN_TEST_SCREENSAVER, T_SCREENSAVER_PREVIEW);
+		DrawStandartCaptButton(RIGHTx, PANEL_H, BTN_TEST_SCREENSAVER, T_SS_PREVIEW);
+	}
+}
 bool strreqi(dword _left, _right)
 	int j;
 	char fname[4096];
 	select_list.ClearList();
 	if(io.dir.buffer)free(io.dir.buffer);
 	io.dir.load(#folder_path,DIR_ONLYREAL);
 	for (j=0; j
+	{
 		strcpy(#fname, io.dir.position(j));
 		strlwr(#fname);
 		if (tabs.active_tab==TAB_SKINS) {
+		}
 		ESDWORD[select_list.count*4 + #files_mas] = j;
 		select_list.count++;
+	}
 	Sort_by_Name(0, select_list.count-1);
 	list.drop();
-	for (j=0; j
-		list.add(io.dir.position(files_mas[j]));
-	}
-	if (!select_list.count) notify(T_NO_FILES);
 	//save current item for tab change
+	//add default item
 	switch(tabs.active_tab) {
+		CASE TAB_SKINS:
-		CASE TAB_SKINS: select_list.cur_y = active_skin; BREAK;
+				select_list.cur_y = active_skin;
+				select_list.count++;
+				list.add(#default_skin);
+				BREAK;
+		CASE TAB_WALLPAPERS:
-		CASE TAB_WALLPAPERS: select_list.cur_y = active_wallpaper; BREAK;
+				select_list.cur_y = active_wallpaper;
+				select_list.count++;
+				list.add(#default_wallp);
+				BREAK;
+		CASE TAB_SCREENSAVERS:
-		CASE TAB_SCREENSAVERS: select_list.cur_y = active_screensaver;
+				select_list.cur_y = active_screensaver;
+	}
+	for (j=0; j
+		miniprintf(#param,"%s/",#folder_path);
+		strcat(#param, io.dir.position(files_mas[j]));
+		list.add(#param);
+	}
+	if (!select_list.count) notify(T_NO_FILES);
 	if (select_list.cur_y>select_list.visible) select_list.first=select_list.cur_y;
 	select_list.CheckDoesValuesOkey();
 	if (LIST_W) draw_window();
+}
 	int i_abs = select_list.first + i;
 	char filename_buf[4096];
 	char* filename = #filename_buf;
-	strcpy(filename, list.get(i_abs));
-	EAX = math.min(strrchr(filename,'.')-1, LIST_W - 24 / 8);
-	filename_buf[EAX] = '\0';
-	if (filename_buf[0]=='T') && (filename_buf[1]=='_') filename+=2;
+	strcpy(filename, list.get(i_abs));
+	if (EAX = strrchr(filename,'/')) filename += EAX;
+	if (ESBYTE[filename]=='T') && (ESBYTE[filename+1]=='_') filename+=2;
+	EAX = math.min(strrchr(filename,'.')-1, LIST_W - 24 / 8);
-	if (EAX = strrchr(filename,'/')) filename += EAX;
+	if(EAX) ESBYTE[filename+EAX] = '\0';
+	//save current item for tab change
-	//save current item for tab change
+	switch(tabs.active_tab) {
+		CASE TAB_SKINS:
+				active_skin = select_list.cur_y;
+				if (!i_abs) filename = T_DEFAULT;
-	switch(tabs.active_tab) {
+				BREAK;
+		CASE TAB_WALLPAPERS:
+				active_wallpaper = select_list.cur_y;
+				if (!i_abs) filename = T_DEFAULT;
-		CASE TAB_SKINS: active_skin = select_list.cur_y; BREAK;
+				BREAK;
-		CASE TAB_WALLPAPERS: active_wallpaper = select_list.cur_y; BREAK;
+		CASE TAB_SCREENSAVERS:
-		CASE TAB_SCREENSAVERS: active_screensaver = select_list.cur_y;
+				active_screensaver = select_list.cur_y;
+	}
 	SetCurDir("/kolibrios");
 	GetCurDir(#real_kolibrios_path, sizeof(real_kolibrios_path));
 	return #real_kolibrios_path;
+}
-void GetScreensaverIniSettings()
+void GetIniSettings()
+{
 	ini.section = "screensaver";
 	screensaver_timeout = ini.GetInt("timeout", 10);
+	ini.GetString("available", #ss_available, sizeof(ss_available), 0);
+	ini.section = "style";
+	ini.GetString("default_skin", #default_skin, sizeof(default_skin), 0);
-	ini.GetString("available", #ss_available, sizeof(ss_available), 0);
+	ini.GetString("default_wallp", #default_wallp, sizeof(default_wallp), 0);
+}
 //===================================================//
 	dword j;
 	char ssmas[sizeof(ss_available)];
 	list.drop();
 	select_list.ClearList();
+	select_list.count++;
+	list.add(T_NO_SS);
 	strcpy(#ssmas, #ss_available);
 	do {
-		j = strrchr(#ss_available, '|');
+		j = strrchr(#ssmas, '|');
-		miniprintf(#param, "/sys/%s", #ss_available + j);
+		miniprintf(#param, "/sys/%s", #ssmas + j);
 		list.add(#param);
-		ESBYTE[#ss_available + j - 1] = '\0';
+		ESBYTE[#ssmas + j - 1] = '\0';
 		select_list.count++;
 	} while (j);
 	if (LIST_W) draw_window();
+}
 void EventDeleteFile()
+{
-	DeleteFile(#cur_file_path);
+	if (select_list.cur_y) DeleteFile(#cur_file_path); //no not delete default
 	Open_Dir();
 void EventApply()
+{
 	char kivparam[4096+10];
-	dword file_name = list.get(select_list.cur_y);
-	miniprintf(#cur_file_path,"%s/",#folder_path);
+	dword file_name = list.get(select_list.cur_y);
-	strcat(#cur_file_path, list.get(select_list.cur_y));
+	strcpy(#cur_file_path, list.get(select_list.cur_y));
 	if (tabs.active_tab==TAB_SKINS)
+	{
 		SetSystemSkin(#cur_file_path);
 		SelectList_Draw();
+	}
 	if (tabs.active_tab==TAB_WALLPAPERS)
+	{
 		SelectList_Draw();
 		miniprintf(#kivparam, "\\S__%s", #cur_file_path);
-		if (optionbox_tiled.checked) kivparam[1]='T';
+		if (optionbox_tiled.checked) || (!select_list.cur_y) kivparam[1]='T';
 		if (optionbox_auto.checked) {
+			file_name += strrchr(file_name, '/');
-			if (ESBYTE[file_name+1] == '_') && (ESBYTE[file_name] == 'T') {
+			if (ESBYTE[file_name] == 'T') && (ESBYTE[file_name+1] == '_') {
 				kivparam[1]='T';
+			}
+		}
 		RunProgram("/sys/media/kiv", #kivparam);
+	}
 	ActivateWindow_Self();
+}
 void EventOpenFile()
+{
-{
+	switch (tabs.active_tab) {
-	if (tabs.active_tab==TAB_SKINS) RunProgram("/sys/skincfg", #cur_file_path);
+		case TAB_SKINS: RunProgram("/sys/skincfg", #cur_file_path); break;
-	if (tabs.active_tab==TAB_WALLPAPERS) RunProgram("/sys/media/kiv", #cur_file_path);
+		case TAB_WALLPAPERS: RunProgram("/sys/media/kiv", #cur_file_path); break;
+		case TAB_SCREENSAVERS: if(select_list.cur_y) RunProgram(list.get(select_list.cur_y), "@ss");
 	if (tabs.active_tab==TAB_SCREENSAVERS) RunProgram(list.get(select_list.cur_y), "@ss");
+}
 void EventExit()

Subversion Repositories Kolibri OS

(root)/programs/cmm/appearance/appearance.c @ 7909 – Rev 9467 → 9469