|
@@ -666,7 +666,7 @@ void laui_Theme(laUiList *uil, laPropPack *Base, laPropPack *UNUSED_This, laColu
|
|
|
laColumn *col, *cl, *cr, *cll, *clr;
|
|
|
laUiItem *sui;
|
|
|
laUiList *tuil;
|
|
|
- laUiItem *ui;
|
|
|
+ laUiItem *ui,*b;
|
|
|
|
|
|
//col = laFirstColumn(uil);
|
|
|
//tuil = laMakeGroup(uil, col, "����ժҪ", 0, 0)->Page; {
|
|
@@ -682,40 +682,98 @@ void laui_Theme(laUiList *uil, laPropPack *Base, laPropPack *UNUSED_This, laColu
|
|
|
// laShowLabel(tuil, crr, 0, "EXEC", 0, 0, 0);
|
|
|
//}
|
|
|
|
|
|
- col = laFirstColumn(uil); laSplitColumn(uil,col,0.5);
|
|
|
+ col = laFirstColumn(uil); laSplitColumn(uil,col,0.65);
|
|
|
cl=laLeftColumn(col,0); cr=laRightColumn(col,0);
|
|
|
+
|
|
|
+ laShowLabel(uil,col,"Theme Details",0,0)->Flags|=LA_TEXT_ALIGN_CENTER;
|
|
|
|
|
|
- ui=laBeginRow(uil,col, 0,0);
|
|
|
- laShowItem(uil,col,Base, "delete");
|
|
|
- laShowItem(uil,col,Base, "name")->Expand=1;
|
|
|
+ laShowItem(uil,cl,Base, "name");
|
|
|
+
|
|
|
+ ui=laBeginRow(uil,cr, 0,0);
|
|
|
+ laShowItem(uil,cr,Base, "duplicate");
|
|
|
+ laShowSeparator(uil,cr)->Expand=1;
|
|
|
+ laShowItem(uil,cr,Base, "delete")->Flags|=LA_UI_FLAGS_ICON;
|
|
|
laEndRow(uil, ui);
|
|
|
+
|
|
|
+ laShowSeparator(uil,col);
|
|
|
|
|
|
- laShowLabel(uil, col, "Basics:",0,0);
|
|
|
- laShowLabel(uil, cl, "Base Color:",0,0)->Flags|=LA_TEXT_ALIGN_RIGHT; laShowItem(uil, cr, Base, "color");
|
|
|
- laShowLabel(uil, cl, "Accent Color:",0,0)->Flags|=LA_TEXT_ALIGN_RIGHT; laShowItem(uil, cr, Base, "accent_color");
|
|
|
- laShowLabel(uil, cl, "Warning Color:",0,0)->Flags|=LA_TEXT_ALIGN_RIGHT; laShowItem(uil, cr, Base, "warning_color");
|
|
|
- laShowItem(uil, cr, Base, "cursor_alpha");
|
|
|
- laShowItem(uil, cr, Base, "selection_alpha");
|
|
|
- laShowItem(uil, cr, Base, "inactive_mix");
|
|
|
- laShowItem(uil, cr, Base, "inactive_saturation");
|
|
|
-
|
|
|
- laShowLabel(uil, col, "Nodes:",0,0);
|
|
|
- laShowItem(uil, cr, Base, "wire_brightness");
|
|
|
- laShowItem(uil, cr, Base, "wire_saturation");
|
|
|
- laShowItem(uil, cr, Base, "wire_transparency");
|
|
|
-
|
|
|
- laShowLabel(uil, col, "Meshes:",0,0);
|
|
|
- laShowItem(uil, cl, Base, "edge_transparency");
|
|
|
- laShowItem(uil, cl, Base, "edge_brightness");
|
|
|
- laShowItem(uil, cr, Base, "vertex_transparency");
|
|
|
- laShowItem(uil, cr, Base, "vertex_brightness");
|
|
|
- laShowItem(uil, col, Base, "svertex_transparency");
|
|
|
- laShowItem(uil, col, Base, "sedge_transparency");
|
|
|
- laShowItem(uil, col, Base, "sface_transparency");
|
|
|
+ ui=laBeginRow(uil,col, 0,0);
|
|
|
+ b=laOnConditionToggle(uil,col,0,0,0,0,0);{
|
|
|
+ laShowLabel(uil,col,"Basics",0,0);
|
|
|
+ laEndRow(uil, ui);
|
|
|
+ laShowItem(uil, cl, Base, "color"); laShowLabel(uil, cr, "Base Color",0,0);
|
|
|
+ laShowItem(uil, cl, Base, "accent_color"); laShowLabel(uil, cr, "Accent Color",0,0);
|
|
|
+ laShowItem(uil, cl, Base, "warning_color"); laShowLabel(uil, cr, "Warning Color",0,0);
|
|
|
+ laShowItem(uil, cl, Base, "cursor_alpha");
|
|
|
+ laShowItem(uil, cl, Base, "selection_alpha");
|
|
|
+ laShowItem(uil, cr, Base, "inactive_mix");
|
|
|
+ laShowItem(uil, cr, Base, "inactive_saturation");
|
|
|
+ }laElse(uil,b);{
|
|
|
+ laShowLabel(uil,col,"Basics",0,0); laEndRow(uil, ui);
|
|
|
+ }laEndCondition(uil,b);
|
|
|
+
|
|
|
+ ui=laBeginRow(uil,col, 0,0);
|
|
|
+ b=laOnConditionToggle(uil,col,0,0,0,0,0);{
|
|
|
+ laShowLabel(uil, col, "Nodes",0,0);
|
|
|
+ laEndRow(uil, ui);
|
|
|
+ laShowItem(uil, cl, Base, "wire_brightness");
|
|
|
+ laShowItem(uil, cl, Base, "wire_saturation");
|
|
|
+ laShowItem(uil, cl, Base, "wire_transparency");
|
|
|
+ }laElse(uil,b);{
|
|
|
+ laShowLabel(uil,col,"Nodes",0,0); laEndRow(uil, ui);
|
|
|
+ }laEndCondition(uil,b);
|
|
|
+
|
|
|
+ if(MAIN.InitArgs.HasWorldObjects){
|
|
|
+ ui=laBeginRow(uil,col, 0,0);
|
|
|
+ b=laOnConditionToggle(uil,col,0,0,0,0,0);{
|
|
|
+ laShowLabel(uil, col, "Meshes",0,0);
|
|
|
+ laEndRow(uil, ui);
|
|
|
+ laShowItem(uil, cl, Base, "edge_transparency");
|
|
|
+ laShowItem(uil, cl, Base, "edge_brightness");
|
|
|
+ laShowItem(uil, cr, Base, "vertex_transparency");
|
|
|
+ laShowItem(uil, cr, Base, "vertex_brightness");
|
|
|
+ laShowItem(uil, col, Base, "svertex_transparency");
|
|
|
+ laShowItem(uil, col, Base, "sedge_transparency");
|
|
|
+ laShowItem(uil, col, Base, "sface_transparency");
|
|
|
+ }laElse(uil,b);{
|
|
|
+ laShowLabel(uil,col,"Meshes",0,0); laEndRow(uil, ui);
|
|
|
+ }laEndCondition(uil,b);
|
|
|
+ }
|
|
|
+
|
|
|
+ laShowSeparator(uil,col);
|
|
|
|
|
|
laShowLabel(uil, col, "Widgets:",0,0);
|
|
|
laShowItem(uil, col, Base, "boxed_themes")->Flags|=(LA_UI_FLAGS_NO_DECAL|LA_UI_FLAGS_NO_GAP);
|
|
|
}
|
|
|
+void laui_ThemePreviewFrame(laUiList *uil, laPropPack *Base, laPropPack *UnusedThis, laColumn *UNUSED_Colums, int context){
|
|
|
+ laColumn* c=laFirstColumn(uil); laUiItem* b,*ui;
|
|
|
+ laUiItem* gui=laMakeEmptyGroup(uil,c,"Boxed Theme",0); laUiList* gu=gui->Page; laColumn* gc=laFirstColumn(gu);
|
|
|
+ gui->Flags|=LA_UI_FLAGS_NO_DECAL;
|
|
|
+ laSplitColumn(gu,gc,0.4); laColumn* gcl=laLeftColumn(gc,0),*gcr=laRightColumn(gc,0);
|
|
|
+ b=laBeginRow(gu,gc,0,0);
|
|
|
+ laShowItemFull(gu,gc,0,"LA_nop",0,"text=⯆;",0,0)->Flags|=LA_UI_FLAGS_NO_EVENT;
|
|
|
+ laShowLabel(gu,gc,"Dialog",0,0)->Expand=1;
|
|
|
+ laShowItemFull(gu,gc,0,"LA_nop",0,"text=Close;icon=🞫;",0,0)->Flags|=LA_UI_FLAGS_NO_EVENT;
|
|
|
+ laEndRow(gu,b);
|
|
|
+ laShowSeparator(gu,gc);
|
|
|
+ laShowLabel(gu,gcl,"Text",0,0);
|
|
|
+ laShowLabel(gu,gcl,"Value",0,0);
|
|
|
+ laShowItem(gu,gcr,0,"la.example_string")->Flags|=LA_TEXT_ONE_LINE|LA_UI_FLAGS_NO_EVENT;
|
|
|
+ laShowItem(gu,gcr,0,"la.example_int")->Flags|=LA_UI_FLAGS_NO_EVENT;
|
|
|
+ b=laBeginRow(gu,gc,0,0);
|
|
|
+ laShowItemFull(gu,gc,0,"LA_nop",0,"text=Cancel;",0,0)->Flags|=LA_UI_FLAGS_NO_EVENT|LA_UI_FLAGS_WARNING;
|
|
|
+ laShowSeparator(gu,gc)->Expand=1;
|
|
|
+ laShowItem(gu,gc,0,"LA_nop")->Flags|=LA_UI_FLAGS_NO_EVENT;
|
|
|
+ laShowItemFull(gu,gc,0,"LA_nop",0,"text=Confirm;",0,0)->Flags|=LA_UI_FLAGS_NO_EVENT|LA_UI_FLAGS_HIGHLIGHT;
|
|
|
+ laEndRow(gu,b);
|
|
|
+}
|
|
|
+void laui_ThemePreview(laUiList *uil, laPropPack *Base, laPropPack *UnusedThis, laColumn *UNUSED_Colums, int context){
|
|
|
+ laColumn* c=laFirstColumn(uil); laUiItem* b,*ui;
|
|
|
+ ui=laShowItem(uil,c,Base,"name"); ui->Expand=1;
|
|
|
+ ui->Flags|=LA_UI_FLAGS_PLAIN|LA_TEXT_ALIGN_CENTER|LA_UI_FLAGS_NO_EVENT;
|
|
|
+ ui=laShowItemFull(uil,c,Base,"preview",0,0,laui_ThemePreviewFrame,0);
|
|
|
+ ui->Flags|=LA_UI_FLAGS_NO_EVENT;
|
|
|
+}
|
|
|
void laui_BoxedThemeItem(laUiList *uil, laPropPack *Base, laPropPack *UNUSED_This, laColumn *UNUSED_Colums, int context){
|
|
|
laColumn *col, *cl, *cr, *crl,*crr;
|
|
|
laUiItem *bracket;
|
|
@@ -1443,15 +1501,24 @@ void laui_UserPreference(laUiList *uil, laPropPack *Base, laPropPack *OperatorIn
|
|
|
|
|
|
muil = laAddTabPage(bracket, "Theme");{
|
|
|
//muil->HeightCoeff = -1;
|
|
|
- mc = laFirstColumn(muil); laSplitColumn(muil,mc,0.4);
|
|
|
- mcl=laLeftColumn(mc,7);mcr=laRightColumn(mc,0);
|
|
|
+ mc = laFirstColumn(muil);
|
|
|
+ //laSplitColumn(muil,mc,0.4); mcl=laLeftColumn(mc,7);mcr=laRightColumn(mc,0);
|
|
|
|
|
|
- if(MAIN.PreferencePageTheme){ MAIN.PreferencePageTheme(muil,0,0,0,0); }
|
|
|
+ if(MAIN.PreferencePageTheme){ MAIN.PreferencePageTheme(muil,0,0,0,0); laShowSeparator(muil,mc); }
|
|
|
|
|
|
- laShowLabel(muil, mcl, "Active Theme", 0, 0);
|
|
|
- laShowItemFull(muil, mcr, 0, "la.themes", LA_WIDGET_COLLECTION_SELECTOR, 0,laui_ThemeListItem,0);
|
|
|
- laShowSeparator(muil,mc);
|
|
|
- laShowItemFull(muil, mc, 0, "la.themes", LA_WIDGET_COLLECTION_SINGLE, 0 ,0,0)->Flags|=LA_UI_FLAGS_NO_DECAL;
|
|
|
+ laUiItem* gui=laMakeGroup(muil,mc,"Installed Themes",0); laUiList* gu=gui->Page; laColumn* gc=laFirstColumn(gu);
|
|
|
+ gu->HeightCoeff=10;
|
|
|
+ laUiItem* ui=laShowItemFull(gu, gc, 0, "la.themes", 0, 0,laui_ThemePreview,0);
|
|
|
+ ui->Expand=10; ui->Flags|=LA_UI_FLAGS_NO_DECAL;
|
|
|
+
|
|
|
+ laUiItem* b=laBeginRow(muil,mc,0,0);
|
|
|
+ laShowSeparator(muil,mc)->Expand=1;
|
|
|
+ laShowItem(muil,mc,0,"LA_new_theme");
|
|
|
+ laEndRow(muil,b);
|
|
|
+
|
|
|
+ //laShowItemFull(muil, mc, 0, "la.themes", LA_WIDGET_COLLECTION_SELECTOR, 0,laui_ThemeListItem,0);
|
|
|
+ //laShowSeparator(muil,mc);
|
|
|
+ laShowItemFull(muil, mc, 0, "la.themes", LA_WIDGET_COLLECTION_SINGLE, 0 ,0,0);//->Flags|=LA_UI_FLAGS_NO_DECAL;
|
|
|
}
|
|
|
|
|
|
muil = laAddTabPage(bracket, "System");{
|