added icons to marker editor

BoyC · Apr 6, 2022 · dd8dd06 · dd8dd06
1 parent 6ba4bd8
commit dd8dd06
Show file tree

Hide file tree

Showing 10 changed files with 352 additions and 321 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@ syntax: glob
 *.*backup*
 **/Release*/*
 **/Debug*/*
+**/Skin*/*
 **/Release_MultiByte*/*
 **/Debug_MultiByte*/*
 *Release*/*

diff --git a/BuildCount.h b/BuildCount.h
@@ -2,7 +2,7 @@
 //Automatically generated build count file. DO NOT EDIT MANUALLY!
 
 #define BUILD_COUNT_ANUBIS 91
-#define BUILD_COUNT_DESKTOP_EDTCHAL 3545
+#define BUILD_COUNT_DESKTOP_EDTCHAL 3547
 
 #define RELEASE_COUNT_ANUBIS 0
 #define RELEASE_COUNT_DESKTOP_EDTCHAL 62

diff --git a/MarkerEditor.cpp b/MarkerEditor.cpp
@@ -1203,6 +1203,13 @@ void GW2MarkerEditor::OnDraw( CWBDrawAPI* API )
 
   if ( mouseItem )
   {
+    if ( mouseItem->GetID() == "Editcategory" )
+      SetMouseToolTip( DICT( "selectcategorytoedit" ) );
+    if ( mouseItem->GetID() == "changemarkertype" )
+      SetMouseToolTip( DICT( "setmarkercategory" ) );
+    if ( mouseItem->GetID() == "deletemarker" )
+      SetMouseToolTip( DICT( "deletemarker" ) );
+
     if ( mouseItem->GetID() == "default1" )
       SetMouseToolTip( Config::GetString( "defaultcategory0" ) );
     if ( mouseItem->GetID() == "default2" )

diff --git a/TacO_Language_en.xml b/TacO_Language_en.xml
@@ -216,6 +216,9 @@
   <token key="*copy_selected_marker" value="Copy selected marker with a small offset"/>
 
   <token key="TacOOnTaskBar" value="Show TacO on Windows task bar (requires restart)"/>
+  <token key="selectcategorytoedit" value="Select Category to Edit"/>
+  <token key="setmarkercategory" value="Change Category of Edited Marker/Trail"/>
+  <token key="deletemarker" value="Delete Edited Marker/Trail"/>
 
   <token key="wurm_tunnel" value="Wurm Tunnel"/>
   <token key="airport" value="Airport"/>

diff --git a/UI.wbs b/UI.wbs
diff --git a/UI.xml b/UI.xml
@@ -23,9 +23,10 @@
       <box id="markereditormain">
         <box class="markereditorpanel">
          <box id="markereditorheader">
-           <button id="Editcategory" text="EDIT CATEGORY"/>
-           <button id="changemarkertype" text="MARKER TYPE"/>
-           <button id="deletemarker" text="DELETE SELECTED"/>
+           <button id="Editcategory"/>
+           <button id="nullbutton"/>
+           <button id="changemarkertype"/>
+           <button id="deletemarker"/>
          </box>
          <label id="label1" class="panellabel" text="VISUAL APPEARANCE"/>
          <box class="markereditorsetting">
@@ -207,15 +208,15 @@
          </box>
           <label id="label6" class="panellabel" text="TRAIL EDITING"/>
           <box id="traileditor">
-            <button id="starttrail" text="O"/>
-            <button id="pausetrail" text="||"/>
-            <button id="startnewsection" text="N" />
-            <button id="deletelastsegment" text="X" />
-            <button id="savetrail" text="\/"/>
-            <button id="loadtrail" text="/\"/>
+            <button id="starttrail"/>
+            <button id="pausetrail"/>
+            <button id="startnewsection"/>
+            <button id="deletelastsegment"/>
+            <button id="savetrail"/>
+            <button id="loadtrail"/>
             <!--button id="newtrail" text="+"/-->
-            <button id="prevsegment" text="&lt;&lt;"/>
-            <button id="nextsegment" text="&gt;&gt;"/>
+            <button id="prevsegment"/>
+            <button id="nextsegment"/>
           </box>
           <label class="panellabel" text="SELECT DEFAULT MARKER TYPES"/>
           <box id="defaultmarkers">

diff --git a/UI_large.css b/UI_large.css
@@ -249,112 +249,13 @@ markereditor
 	background-color:rgba(0,0,0,0);
 }
 
-#markereditorbox
-{
-	margin:0px;
-	child-layout: vertical;
-	child-fill-x: false;
-	child-fill-y: false;
-	child-spacing: 1px;
-}
-
-markereditor label
-{
-	width:100%;
-	height:23px;
-	text-align:left;
-}
-
-markereditor button
-{
-	width:190px;
-	height:23px;
-        padding-bottom:4px;
-}
-
-#hpgrid
-{
-	width:283px;
-	height:15px;
-	left:50%-199px;
-	top:96px;
-}
-
-#notepadbox
-{
-	margin:0px;
-}
-
-notepad
-{
-	margin:0px;
-}
-
-notepad textbox
-{
-	background:rgba(0,0,0,0.7);
-	margin:1px;
-	padding:1px;
-	border:1px;
-}
-
-notepad textbox:selection:active
-{
-	background:rgba(64,64,64,1);
-}
-
-notepad textbox:selection:hover
-{
-	background:rgba(192,192,192,1);
-}
-
-tptracker
-{
-	margin:0px;
-}
-
-#APIkeyInput
-{
-	background:rgba(0,0,0,0.7);
-	padding:1px;
-	border:1px;
-	width:565px;
-	height:21px;
-	top:50%+20px;
-}
-
-#MenuHoverBox
-{
-	left:0px;
-	top:0px;
-	width:355px;
-	height:35px;
-	background-color:none;
-}
-
-#startnewsection
-{
-	visibility:hidden;
-}
-
-contextmenu:active
-{
-	font-color:#ffffcc77;
-}
-
-markereditor
-{
-	margin:0px;
-}
-
 #markereditorbox
 {
 	margin:0px;
 	child-layout: vertical;
 	child-fill-x: true;
 	child-fill-y: true;
 	child-spacing: 1px;
-	background-color:rgba(0,0,0,0.5);
 }
 
 #markereditorheader
@@ -363,6 +264,8 @@ markereditor
     child-spacing:2px;
     padding:2px;
     child-fill-x:true;
+    height:20px;
+    child-align-x:center;
 }
 
 #markereditormain
@@ -535,7 +438,8 @@ markereditor
 #markereditorheader button
 {
   width:none;
-  height:15px;
+  height:20px;
+  width:20px;
   padding-bottom:1px;
 }
 
@@ -552,4 +456,70 @@ markereditor
 #deletemarker
 {
    padding:2px;
+}
+
+#starttrail
+{
+  background: skin(record) center middle;
+  font-color:#ff0000;
+}
+
+#pausetrail
+{
+  background: skin(pause) center middle;
+}
+
+#startnewsection
+{
+  background: skin(newsegment) center middle;
+}
+
+#deletelastsegment
+{
+  background: skin(delete) center middle;
+}
+
+#savetrail
+{
+  background: skin(save) center middle;
+}
+
+#loadtrail
+{
+  background: skin(open) center middle;
+}
+
+#prevsegment
+{
+  background: skin(previous) center middle;
+}
+
+#nextsegment
+{
+  background: skin(next) center middle;
+}
+
+#Editcategory
+{
+  background: skin(edit) center middle;
+}
+
+#changemarkertype
+{
+  background: skin(type) center middle;
+}
+
+#deletemarker
+{
+  background: skin(trash) center middle;
+}
+
+#markereditorheader
+{
+  height:24px;
+}
+
+#nullbutton
+{
+  opacity:0;
 }
diff --git a/UI_larger.css b/UI_larger.css
@@ -369,6 +369,8 @@ markereditor
     child-spacing:2px;
     padding:2px;
     child-fill-x:true;
+    height:20px;
+    child-align-x:center;
 }
 
 #markereditormain
@@ -541,7 +543,8 @@ markereditor
 #markereditorheader button
 {
   width:none;
-  height:15px;
+  height:20px;
+  width:20px;
   padding-bottom:1px;
 }
 
@@ -558,4 +561,70 @@ markereditor
 #deletemarker
 {
    padding:2px;
+}
+
+#starttrail
+{
+  background: skin(record) center middle;
+  font-color:#ff0000;
+}
+
+#pausetrail
+{
+  background: skin(pause) center middle;
+}
+
+#startnewsection
+{
+  background: skin(newsegment) center middle;
+}
+
+#deletelastsegment
+{
+  background: skin(delete) center middle;
+}
+
+#savetrail
+{
+  background: skin(save) center middle;
+}
+
+#loadtrail
+{
+  background: skin(open) center middle;
+}
+
+#prevsegment
+{
+  background: skin(previous) center middle;
+}
+
+#nextsegment
+{
+  background: skin(next) center middle;
+}
+
+#Editcategory
+{
+  background: skin(edit) center middle;
+}
+
+#changemarkertype
+{
+  background: skin(type) center middle;
+}
+
+#deletemarker
+{
+  background: skin(trash) center middle;
+}
+
+#markereditorheader
+{
+  height:24px;
+}
+
+#nullbutton
+{
+  opacity:0;
 }