gui: create assets, add identifier chars automatically to qualifiers …

…and sub-qualifiers * Add identifier chars automatically to qualifier assets and sub-qualifier assets. Fixes RavenProject#1152 * Increase size of dropdown boxes with asset names.
fdoving · Dec 11, 2021 · 3a92458 · 3a92458
1 parent 3fee4bb
commit 3a92458
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/src/qt/createassetdialog.cpp b/src/qt/createassetdialog.cpp
@@ -1021,12 +1021,16 @@ void CreateAssetDialog::updatePresentedAssetName(QString name)
 
 QString CreateAssetDialog::GetSpecialCharacter()
 {
-    if (type == IntFromAssetType(AssetType::SUB) || type == IntFromAssetType(AssetType::SUB_QUALIFIER))
+    if (type == IntFromAssetType(AssetType::SUB))
         return "/";
     else if (type == IntFromAssetType(AssetType::UNIQUE))
         return "#";
     else if (type == IntFromAssetType(AssetType::MSGCHANNEL))
         return "~";
+    else if (type == IntFromAssetType(AssetType::SUB_QUALIFIER))
+        return "/#";
+    else if (type == IntFromAssetType(AssetType::QUALIFIER))
+        return "#";
 
     return "";
 }
@@ -1044,9 +1048,9 @@ QString CreateAssetDialog::GetAssetName()
     else if (type == IntFromAssetType(AssetType::RESTRICTED))
         return ui->nameText->text();
     else if (type == IntFromAssetType(AssetType::QUALIFIER))
-        return ui->nameText->text();
+        return ui->assetList->currentText() + "#" + ui->nameText->text();
     else if (type == IntFromAssetType(AssetType::SUB_QUALIFIER))
-        return ui->assetList->currentText() + "/" + ui->nameText->text();
+        return ui->assetList->currentText() + "/#" + ui->nameText->text();
     return "";
 }
 

diff --git a/src/qt/forms/createassetdialog.ui b/src/qt/forms/createassetdialog.ui
@@ -612,10 +612,24 @@
              </widget>
             </item>
             <item>
-             <widget class="QComboBox" name="assetType"/>
+             <widget class="QComboBox" name="assetType">
+              <property name="minimumSize">
+               <size>
+                <width>250</width>
+                <height>0</height>
+               </size>
+              </property>
+             </widget>
             </item>
             <item>
-             <widget class="QComboBox" name="assetList"/>
+             <widget class="QComboBox" name="assetList">
+              <property name="minimumSize">
+               <size>
+                <width>250</width>
+                <height>0</height>
+               </size>
+              </property>
+             </widget>
             </item>
             <item>
              <spacer name="horizontalSpacer_4">