mirror of
https://github.com/dcs-liberation/dcs_liberation.git
synced 2025-11-10 14:22:26 +00:00
Added about dialog & credits + icon in pass turn button
This commit is contained in:
parent
2428d39308
commit
89e8ef65ea
@ -3,7 +3,7 @@
|
|||||||
QLiberationWindow{
|
QLiberationWindow{
|
||||||
}
|
}
|
||||||
|
|
||||||
QTopPanel,
|
/*QTopPanel,
|
||||||
QTopPanel *{
|
QTopPanel *{
|
||||||
background-color: #4E5760;
|
background-color: #4E5760;
|
||||||
color: white;
|
color: white;
|
||||||
@ -16,4 +16,4 @@ QPushButton[style="btn-primary"]{
|
|||||||
color:white;
|
color:white;
|
||||||
padding: 21px 5px 21px 5px;
|
padding: 21px 5px 21px 5px;
|
||||||
margin-top: 6px;
|
margin-top: 6px;
|
||||||
}
|
}*/
|
||||||
@ -48,7 +48,9 @@ def load_icons():
|
|||||||
ICONS["Day"] = QPixmap("./resources/ui/daytime/day.png")
|
ICONS["Day"] = QPixmap("./resources/ui/daytime/day.png")
|
||||||
ICONS["Dusk"] = QPixmap("./resources/ui/daytime/dusk.png")
|
ICONS["Dusk"] = QPixmap("./resources/ui/daytime/dusk.png")
|
||||||
ICONS["Night"] = QPixmap("./resources/ui/daytime/night.png")
|
ICONS["Night"] = QPixmap("./resources/ui/daytime/night.png")
|
||||||
|
|
||||||
ICONS["Money"] = QPixmap("./resources/ui/misc/money_icon.png")
|
ICONS["Money"] = QPixmap("./resources/ui/misc/money_icon.png")
|
||||||
|
ICONS["PassTurn"] = QPixmap("./resources/ui/misc/pass_turn.png")
|
||||||
ICONS["Ordnance"] = QPixmap("./resources/ui/misc/ordnance_icon.png")
|
ICONS["Ordnance"] = QPixmap("./resources/ui/misc/ordnance_icon.png")
|
||||||
|
|
||||||
ICONS["target"] = QPixmap("./resources/ui/ground_assets/target.png")
|
ICONS["target"] = QPixmap("./resources/ui/ground_assets/target.png")
|
||||||
|
|||||||
@ -4,6 +4,7 @@ from game import Game
|
|||||||
from qt_ui.widgets.QBudgetBox import QBudgetBox
|
from qt_ui.widgets.QBudgetBox import QBudgetBox
|
||||||
from qt_ui.widgets.QTurnCounter import QTurnCounter
|
from qt_ui.widgets.QTurnCounter import QTurnCounter
|
||||||
|
|
||||||
|
import qt_ui.uiconstants as CONST
|
||||||
|
|
||||||
class QTopPanel(QFrame):
|
class QTopPanel(QFrame):
|
||||||
|
|
||||||
@ -21,6 +22,7 @@ class QTopPanel(QFrame):
|
|||||||
self.budgetBox.setBudget(self.game.budget, self.game.budget_reward_amount)
|
self.budgetBox.setBudget(self.game.budget, self.game.budget_reward_amount)
|
||||||
|
|
||||||
self.passTurn = QPushButton("Pass Turn")
|
self.passTurn = QPushButton("Pass Turn")
|
||||||
|
self.passTurn.setIcon(CONST.ICONS["PassTurn"])
|
||||||
self.passTurn.setProperty("style", "btn-primary")
|
self.passTurn.setProperty("style", "btn-primary")
|
||||||
|
|
||||||
self.layout = QHBoxLayout()
|
self.layout = QHBoxLayout()
|
||||||
|
|||||||
0
qt_ui/windows/QGameSettings.py
Normal file
0
qt_ui/windows/QGameSettings.py
Normal file
@ -1,14 +1,16 @@
|
|||||||
from PySide2.QtGui import QIcon
|
|
||||||
from PySide2.QtWidgets import QWidget, QHBoxLayout, QVBoxLayout, QMainWindow, QAction, QFrame
|
|
||||||
import webbrowser
|
import webbrowser
|
||||||
|
|
||||||
|
from PySide2.QtGui import QIcon
|
||||||
|
from PySide2.QtWidgets import QWidget, QHBoxLayout, QVBoxLayout, QMainWindow, QAction, QMessageBox
|
||||||
|
|
||||||
|
import qt_ui.uiconstants as CONST
|
||||||
|
from game import Game
|
||||||
from qt_ui.uiconstants import URLS
|
from qt_ui.uiconstants import URLS
|
||||||
from qt_ui.widgets.QTopPanel import QTopPanel
|
from qt_ui.widgets.QTopPanel import QTopPanel
|
||||||
from qt_ui.widgets.map.QLiberationMap import QLiberationMap
|
from qt_ui.widgets.map.QLiberationMap import QLiberationMap
|
||||||
import qt_ui.uiconstants as CONST
|
|
||||||
from qt_ui.windows.QNewGameWizard import NewGameWizard
|
from qt_ui.windows.QNewGameWizard import NewGameWizard
|
||||||
from userdata import persistency
|
from userdata import persistency
|
||||||
from game import Game
|
|
||||||
|
|
||||||
class QLiberationWindow(QMainWindow):
|
class QLiberationWindow(QMainWindow):
|
||||||
|
|
||||||
@ -18,7 +20,6 @@ class QLiberationWindow(QMainWindow):
|
|||||||
self.init_ui()
|
self.init_ui()
|
||||||
|
|
||||||
def init_ui(self):
|
def init_ui(self):
|
||||||
|
|
||||||
self.setGeometry(300, 100, 270, 100)
|
self.setGeometry(300, 100, 270, 100)
|
||||||
self.setWindowTitle("DCS Liberation")
|
self.setWindowTitle("DCS Liberation")
|
||||||
self.setWindowIcon(QIcon("../resources/icon.png"))
|
self.setWindowIcon(QIcon("../resources/icon.png"))
|
||||||
@ -51,6 +52,10 @@ class QLiberationWindow(QMainWindow):
|
|||||||
self.saveGameAction.setIcon(QIcon(CONST.ICONS["Save"]))
|
self.saveGameAction.setIcon(QIcon(CONST.ICONS["Save"]))
|
||||||
self.saveGameAction.triggered.connect(self.saveGame)
|
self.saveGameAction.triggered.connect(self.saveGame)
|
||||||
|
|
||||||
|
self.showAboutDialogAction = QAction("About DCS Liberation", self)
|
||||||
|
self.showAboutDialogAction.setIcon(QIcon.fromTheme("help-about"))
|
||||||
|
self.showAboutDialogAction.triggered.connect(self.showAboutDialog)
|
||||||
|
|
||||||
def init_toolbar(self):
|
def init_toolbar(self):
|
||||||
self.tool_bar = self.addToolBar("File")
|
self.tool_bar = self.addToolBar("File")
|
||||||
self.tool_bar.addAction(self.newGameAction)
|
self.tool_bar.addAction(self.newGameAction)
|
||||||
@ -74,6 +79,8 @@ class QLiberationWindow(QMainWindow):
|
|||||||
help_menu.addAction("Contribute", lambda: webbrowser.open_new_tab(URLS["Repository"]))
|
help_menu.addAction("Contribute", lambda: webbrowser.open_new_tab(URLS["Repository"]))
|
||||||
help_menu.addAction("Forum Thread", lambda: webbrowser.open_new_tab(URLS["ForumThread"]))
|
help_menu.addAction("Forum Thread", lambda: webbrowser.open_new_tab(URLS["ForumThread"]))
|
||||||
help_menu.addAction("Report an issue", lambda: webbrowser.open_new_tab(URLS["Issues"]))
|
help_menu.addAction("Report an issue", lambda: webbrowser.open_new_tab(URLS["Issues"]))
|
||||||
|
help_menu.addSeparator()
|
||||||
|
help_menu.addAction(self.showAboutDialogAction)
|
||||||
|
|
||||||
displayMenu = self.menu.addMenu("Display")
|
displayMenu = self.menu.addMenu("Display")
|
||||||
|
|
||||||
@ -90,7 +97,8 @@ class QLiberationWindow(QMainWindow):
|
|||||||
tg_line_visibility = QAction('Lines', displayMenu)
|
tg_line_visibility = QAction('Lines', displayMenu)
|
||||||
tg_line_visibility.setCheckable(True)
|
tg_line_visibility.setCheckable(True)
|
||||||
tg_line_visibility.setChecked(True)
|
tg_line_visibility.setChecked(True)
|
||||||
tg_line_visibility.toggled.connect(lambda: QLiberationMap.set_display_rule("lines", tg_line_visibility.isChecked()))
|
tg_line_visibility.toggled.connect(
|
||||||
|
lambda: QLiberationMap.set_display_rule("lines", tg_line_visibility.isChecked()))
|
||||||
|
|
||||||
displayMenu.addAction(tg_go_visibility)
|
displayMenu.addAction(tg_go_visibility)
|
||||||
displayMenu.addAction(tg_cp_visibility)
|
displayMenu.addAction(tg_cp_visibility)
|
||||||
@ -99,7 +107,7 @@ class QLiberationWindow(QMainWindow):
|
|||||||
def newGame(self):
|
def newGame(self):
|
||||||
wizard = NewGameWizard(self)
|
wizard = NewGameWizard(self)
|
||||||
wizard.show()
|
wizard.show()
|
||||||
wizard.accepted.connect(lambda : self.setGame(wizard.generatedGame))
|
wizard.accepted.connect(lambda: self.setGame(wizard.generatedGame))
|
||||||
|
|
||||||
def saveGame(self):
|
def saveGame(self):
|
||||||
print("Saving game")
|
print("Saving game")
|
||||||
@ -108,3 +116,18 @@ class QLiberationWindow(QMainWindow):
|
|||||||
def setGame(self, game: Game):
|
def setGame(self, game: Game):
|
||||||
self.game = game
|
self.game = game
|
||||||
self.liberation_map.setGame(game)
|
self.liberation_map.setGame(game)
|
||||||
|
|
||||||
|
def showAboutDialog(self):
|
||||||
|
text = "<h3>DCS Liberation</h3>" + \
|
||||||
|
"<h4>Repository</h4>" + \
|
||||||
|
"<b>Source code :</b> https://github.com/shdwp/dcs_liberation<br/>" + \
|
||||||
|
"<h4>Contributors</h4>" + \
|
||||||
|
"<b>Author :</b> sdwp<br/>" + \
|
||||||
|
"<b>Contributors :</b>" + " Khopa, Wrycu, calvinmorrow, JohanAberg<br/>"
|
||||||
|
|
||||||
|
about = QMessageBox()
|
||||||
|
about.setWindowTitle("About DCS Liberation")
|
||||||
|
about.setIcon(QMessageBox.Icon.Information)
|
||||||
|
about.setText(text)
|
||||||
|
print(about.textFormat())
|
||||||
|
about.exec_()
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user