Skip to content

Commit

Permalink
Merge branch 'map-generator' into mapgen
Browse files Browse the repository at this point in the history
  • Loading branch information
Gatsik committed Feb 26, 2021
2 parents 490294e + c888fbe commit a5e564a
Show file tree
Hide file tree
Showing 18 changed files with 1,727 additions and 20 deletions.
5 changes: 1 addition & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
*.pydev*
*.vcproj
.idea/
lib/faf-uid
lib/faf-uid.exe
ice-adapter/
lib/
build/
dist/
Thumbs.db
Expand All @@ -26,7 +24,6 @@ client_venv
*.egg-info
.vagrant
.cache
#new
*.dll
*.exe
*.pac
Expand Down
36 changes: 35 additions & 1 deletion res/client/client.css
Original file line number Diff line number Diff line change
Expand Up @@ -507,18 +507,28 @@ QDialog
background-color: #575656;
}

QCheckBox#spoilerCheckbox, #automaticCheckbox, #showLatestCheckbox, #hideUnrCheckbox
QDialog#MapGenOptionsDialog
{
background-color:#202025;
alternate-background-color: #303035;
}
QCheckBox#spoilerCheckbox, #automaticCheckbox, #showLatestCheckbox, #hideUnrCheckbox, #landRandomDensity::enabled, #plateausRandomDensity::enabled,
#mountainsRandomDensity::enabled, #rampsRandomDensity::enabled, #mexRandomDensity::enabled, #reclaimRandomDensity::enabled
{
color: silver;
}
QCheckBox#spoilerCheckbox::indicator:unchecked, #automaticCheckbox::indicator:unchecked, #showLatestCheckbox::indicator:unchecked,
#hideUnrCheckbox::indicator:unchecked
,#landRandomDensity::indicator::unchecked, #plateausRandomDensity::indicator::unchecked, #mountainsRandomDensity::indicator::unchecked
,#rampsRandomDensity::indicator::unchecked, #mexRandomDensity::indicator::unchecked ,#reclaimRandomDensity::indicator::unchecked
{
image: url('%THEMEPATH%/client/chboxUncheked.png');
}

QCheckBox#spoilerCheckbox::indicator:checked, #automaticCheckbox::indicator:checked, #showLatestCheckbox::indicator:checked,
#hideUnrCheckbox::indicator:checked
,#landRandomDensity::indicator::checked, #plateausRandomDensity::indicator::checked, #mountainsRandomDensity::indicator::checked
,#rampsRandomDensity::indicator::checked, #mexRandomDensity::indicator::checked ,#reclaimRandomDensity::indicator::checked
{
image: url('%THEMEPATH%/client/chboxCheked.png');
}
Expand Down Expand Up @@ -593,6 +603,30 @@ QPushButton#RefreshResetButton, #advResetButton
background-color: rgb(39, 39, 45);
}

QPushButton#generateMapButton
{
color: silver;
border-radius: 2px;
border: 0.5px solid rgb(70, 70, 70);
font: bold 14px;
min-height: 30px;
background-color: rgb(39, 39, 45);
}
QPushButton#saveMapGenSettingsButton, #resetMapGenSettingsButton
{
color: silver;
border: 0.5px solid rgb(70, 70, 70);
background-color: rgb(39, 39, 45);
}
QPushButton#saveMapGenSettingsButton::hover, #resetMapGenSettingsButton::hover,#generateMapButton::hover
{
border: none;

color:silver;
padding:5px;
background-color:#808080;
border-radius : 5px;
}
QPushButton#newsSettings
{
qproperty-icon: url('%THEMEPATH%/client/settings.png');
Expand Down
15 changes: 15 additions & 0 deletions res/client/client.ui
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@
<addaction name="actionSetAutoLogin"/>
<addaction name="actionSetAutoDownloadMods"/>
<addaction name="actionSetAutoDownloadMaps"/>
<addaction name="actionSetAutoGenerateMaps"/>
<addaction name="separator"/>
<addaction name="actionLink_account_to_Steam"/>
<addaction name="separator"/>
Expand All @@ -366,6 +367,7 @@
<addaction name="actionClearSettings"/>
<addaction name="separator"/>
<addaction name="actionClearGameFiles"/>
<addaction name="actionClearMapGenerators"/>
</widget>
<widget class="QMenu" name="menuChat">
<property name="title">
Expand Down Expand Up @@ -895,6 +897,19 @@
<string>Keep cache while in session</string>
</property>
</action>
<action name="actionSetAutoGenerateMaps">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Automatic Generating of Maps</string>
</property>
</action>
<action name="actionClearMapGenerators">
<property name="text">
<string>Map Generators</string>
</property>
</action>
</widget>
<resources/>
<connections/>
Expand Down
14 changes: 14 additions & 0 deletions res/games/host.ui
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,19 @@
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QPushButton" name="generateButton">
<property name="maximumSize">
<size>
<width>100</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>Map Generator</string>
</property>
</widget>
</item>
</layout>
<zorder>label</zorder>
<zorder>titleEdit</zorder>
Expand All @@ -252,6 +265,7 @@
<zorder>gamePreview</zorder>
<zorder>hostButton</zorder>
<zorder>modList</zorder>
<zorder>generateButton</zorder>
</widget>
<resources/>
<connections>
Expand Down
Loading

0 comments on commit a5e564a

Please sign in to comment.