Skip to content

Commit

Permalink
Fixed some missing window titles and icons, and reworded some text st…
Browse files Browse the repository at this point in the history
…rings. (#5)

Fixed missing window titles/icons, reworded some text strings

Also changed the default "None.arc" text on the map change nodes to be "/Maps/*.kpbin"

---------

Co-authored-by: RoadrunnerWMC <RoadrunnerWMC@users.noreply.github.com>
  • Loading branch information
MandyIGuess and RoadrunnerWMC authored Mar 31, 2024
1 parent 77de29f commit 2f34276
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 13 deletions.
4 changes: 4 additions & 0 deletions src/dialogs.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ class KPTilesetChooserDialog(QtWidgets.QDialog):
def __init__(self, label='Choose a tileset', specials=None):
QtWidgets.QDialog.__init__(self)

self.setWindowTitle('Select Tileset')

self.label = QtWidgets.QLabel(label)
self.label.setWordWrap(True)

Expand Down Expand Up @@ -75,6 +77,8 @@ class KPAnimationPresetChooser(QtWidgets.QDialog):
def __init__(self, label='Choose a preset to add:', specials=None):
QtWidgets.QDialog.__init__(self)

self.setWindowTitle('Add Preset')

self.label = QtWidgets.QLabel(label)
self.label.setWordWrap(True)

Expand Down
6 changes: 3 additions & 3 deletions src/editorui/paths.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ class mapArcEdit(QtWidgets.QLineEdit):
def __init__(self):
QtWidgets.QLineEdit.__init__(self)

self.setText('None.arc')
self.setText('/Maps/*.kpbin')

palette = self.palette()
palette.setColor(QtGui.QPalette.ButtonText, Qt.black)
Expand Down Expand Up @@ -256,7 +256,7 @@ def stateChange(self, state):

elif state == PATH_NODE_STATE_EXIT:
node.transition = 0
node.mapChange = 'None.arc'
node.mapChange = '/Maps/*.kpbin'
node.foreignID = 0

usedIDs = []
Expand All @@ -270,7 +270,7 @@ def stateChange(self, state):
node.mapID = i

self.foreignID.setValue(1)
self.mapChange.setText('None.arc')
self.mapChange.setText('/Maps/*.kpbin')
self.transition.setCurrentIndex(0)

elif state == PATH_NODE_STATE_TRANSITION:
Expand Down
2 changes: 2 additions & 0 deletions src/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ def run():
else:
KP.app.settings = QtCore.QSettings('Koopatlas', 'Newer Team')

KP.app.setWindowIcon(QtGui.QIcon('Resources/Koopatlas.png'))

from mapdata import KPMap
KP.map = KPMap()

Expand Down
19 changes: 9 additions & 10 deletions src/ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ def setTileset(self):

from dialogs import KPTilesetChooserDialog

tilesetName = KPTilesetChooserDialog.run('Choose a tileset for the %s layer' % name)
tilesetName = KPTilesetChooserDialog.run('Choose a tileset for the %s layer:' % name)
if tilesetName is None:
return

Expand All @@ -212,7 +212,7 @@ def addLayer(self, associate, dialog, tileset=None):
if tileset:
self.lastTileset = tileset
elif dialog or not self.lastTileset:
tilesetName = KPTilesetChooserDialog.run('Choose a tileset for the %s layer' % name)
tilesetName = KPTilesetChooserDialog.run('Choose a tileset for the %s layer:' % name)
if tilesetName is None:
return False

Expand Down Expand Up @@ -429,7 +429,7 @@ def handleRowChanged(self, current):
def addTileLayer(self):
from dialogs import KPTilesetChooserDialog

tilesetName = KPTilesetChooserDialog.run('Choose a tileset for the new layer')
tilesetName = KPTilesetChooserDialog.run('Choose a tileset for the new layer:')
if tilesetName is None:
return

Expand Down Expand Up @@ -1092,7 +1092,6 @@ def __init__(self):
QtWidgets.QMainWindow.__init__(self)

self.setWindowTitle('Koopatlas')
self.setWindowIcon(QtGui.QIcon('Resources/Koopatlas.png'))
self.setIconSize(QtCore.QSize(16, 16))

self.scene = KPMapScene()
Expand Down Expand Up @@ -1435,7 +1434,7 @@ def exportMap(self):
def screenshot(self):
items = ("Current Window", "Entire Map")

item, ok = QtWidgets.QInputDialog.getItem(self, "QInputDialog.getItem()",
item, ok = QtWidgets.QInputDialog.getItem(self, "Screenshot",
"Choose a Screenshot Source:", items, 0, False)
if ok and item:
fn = QFileDialog_getSaveFileName(self, 'Choose a new filename', 'untitled.png', 'Portable Network Graphics (*.png)')
Expand Down Expand Up @@ -1463,7 +1462,7 @@ def screenshot(self):


def exportDoodads(self):
fn = QtWidgets.QFileDialog.getExistingDirectory(self, 'Choose a folder')
fn = QtWidgets.QFileDialog.getExistingDirectory(self, 'Export Doodads')
if fn == '': return
fn = unicode(fn)

Expand All @@ -1472,7 +1471,7 @@ def exportDoodads(self):


def batchSave(self):
target = QtWidgets.QFileDialog.getExistingDirectory(self, 'Choose a folder')
target = QtWidgets.QFileDialog.getExistingDirectory(self, 'Choose a folder. All KPMAP files will be exported to KPBIN.')
if target == '': return
target = unicode(target)

Expand Down Expand Up @@ -1545,7 +1544,7 @@ def paste(self):
def moveTilesetToFolder(self):

path = QFileDialog_getOpenFileName(self,
"Choose a tileset. Tileset will be copied to the Koopatlas Tilesets Folder.", "",
"Choose a tileset file. It will be copied to the Koopatlas Tilesets folder.", "",
"Koopuzzle Tilesets (*.arc)")
if path:
import shutil
Expand All @@ -1570,7 +1569,7 @@ def changeTileset(self):

from dialogs import KPTilesetChooserDialog

tilesetName = KPTilesetChooserDialog.run('Choose a tileset to change to')
tilesetName = KPTilesetChooserDialog.run('Choose a tileset to change to:')
if tilesetName is None:
return

Expand Down Expand Up @@ -1650,7 +1649,7 @@ def saveAnimPresets(self):
return

path = QFileDialog_getSaveFileName(self,
"Choose a tileset. Tileset will be copied to the Koopatlas Tilesets Folder.", "KP Preset.kpa",
"Save Koopatlas Animation Preset externally.", "KP Preset.kpa",
"Koopatlas Animation Preset (*.kpa)")

if path:
Expand Down

0 comments on commit 2f34276

Please sign in to comment.