mirror of
https://github.com/olivierkes/manuskript.git
synced 2024-06-25 17:50:48 +12:00
Creates empty import window
This commit is contained in:
Olivier Keshavjee
parent
1f04bf6f54
commit
572feb5409
|
|
@ -21,6 +21,7 @@ from manuskript.settingsWindow import settingsWindow
|
|||
from manuskript.ui import style
|
||||
from manuskript.ui.about import aboutDialog
|
||||
from manuskript.ui.collapsibleDockWidgets import collapsibleDockWidgets
|
||||
from manuskript.ui.importers.importer import importerDialog
|
||||
from manuskript.ui.exporters.exporter import exporterDialog
|
||||
from manuskript.ui.helpLabel import helpLabel
|
||||
from manuskript.ui.mainWindow import Ui_MainWindow
|
||||
|
|
@ -97,12 +98,13 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
|||
# Main Menu
|
||||
for i in [self.actSave, self.actSaveAs, self.actCloseProject,
|
||||
self.menuEdit, self.menuView, self.menuTools, self.menuHelp,
|
||||
self.actCompile, self.actSettings]:
|
||||
self.actImport, self.actCompile, self.actSettings]:
|
||||
i.setEnabled(False)
|
||||
|
||||
self.actOpen.triggered.connect(self.welcome.openFile)
|
||||
self.actSave.triggered.connect(self.saveDatas)
|
||||
self.actSaveAs.triggered.connect(self.welcome.saveAsFile)
|
||||
self.actImport.triggered.connect(self.doImport)
|
||||
self.actCompile.triggered.connect(self.doCompile)
|
||||
self.actLabels.triggered.connect(self.settingsLabel)
|
||||
self.actStatus.triggered.connect(self.settingsStatus)
|
||||
|
|
@ -460,7 +462,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
|||
i.setEnabled(False)
|
||||
for i in [self.actSave, self.actSaveAs, self.actCloseProject,
|
||||
self.menuEdit, self.menuView, self.menuTools, self.menuHelp,
|
||||
self.actCompile, self.actSettings]:
|
||||
self.actImport, self.actCompile, self.actSettings]:
|
||||
i.setEnabled(True)
|
||||
|
||||
# Add project name to Window's name
|
||||
|
|
@ -504,7 +506,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
|||
i.setEnabled(True)
|
||||
for i in [self.actSave, self.actSaveAs, self.actCloseProject,
|
||||
self.menuEdit, self.menuView, self.menuTools, self.menuHelp,
|
||||
self.actCompile, self.actSettings]:
|
||||
self.actImport, self.actCompile, self.actSettings]:
|
||||
i.setEnabled(False)
|
||||
|
||||
# Set Window's name - no project loaded
|
||||
|
|
@ -1306,9 +1308,17 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
|||
# POV in settings / views
|
||||
|
||||
###############################################################################
|
||||
# COMPILE
|
||||
# IMPORT / EXPORT
|
||||
###############################################################################
|
||||
|
||||
def doImport(self):
|
||||
self.dialog = importerDialog(mw=self)
|
||||
self.dialog.show()
|
||||
|
||||
r = self.dialog.geometry()
|
||||
r2 = self.geometry()
|
||||
self.dialog.move(r2.center() - r.center())
|
||||
|
||||
def doCompile(self):
|
||||
self.dialog = exporterDialog(mw=self)
|
||||
self.dialog.show()
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ from manuskript.ui import style
|
|||
from manuskript.ui.editors.editorWidget import editorWidget
|
||||
from manuskript.ui.editors.fullScreenEditor import fullScreenEditor
|
||||
from manuskript.ui.editors.mainEditor_ui import Ui_mainEditor
|
||||
from manuskript.import_export import opml as opmlInputExport
|
||||
from manuskript.importer import opml as opmlInputExport
|
||||
|
||||
locale.setlocale(locale.LC_ALL, '')
|
||||
|
||||
|
|
|
|||
0
manuskript/ui/importers/__init__.py
Normal file
0
manuskript/ui/importers/__init__.py
Normal file
23
manuskript/ui/importers/importer.py
Normal file
23
manuskript/ui/importers/importer.py
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
#!/usr/bin/env python
|
||||
# --!-- coding: utf8 --!--
|
||||
import json
|
||||
import os
|
||||
|
||||
from PyQt5.QtCore import Qt
|
||||
from PyQt5.QtGui import QBrush, QColor, QIcon
|
||||
from PyQt5.QtWidgets import QWidget
|
||||
|
||||
from manuskript import exporter
|
||||
from manuskript.functions import lightBlue, writablePath
|
||||
from manuskript.ui.importers.importer_ui import Ui_importer
|
||||
|
||||
|
||||
class importerDialog(QWidget, Ui_importer):
|
||||
def __init__(self, parent=None, mw=None):
|
||||
QWidget.__init__(self, parent)
|
||||
self.setupUi(self)
|
||||
|
||||
# Var
|
||||
self.mw = mw
|
||||
|
||||
#TODO
|
||||
72
manuskript/ui/importers/importer_ui.py
Normal file
72
manuskript/ui/importers/importer_ui.py
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Form implementation generated from reading ui file 'manuskript/ui/importers/importer_ui.ui'
|
||||
#
|
||||
# Created by: PyQt5 UI code generator 5.9
|
||||
#
|
||||
# WARNING! All changes made in this file will be lost!
|
||||
|
||||
from PyQt5 import QtCore, QtGui, QtWidgets
|
||||
|
||||
class Ui_importer(object):
|
||||
def setupUi(self, importer):
|
||||
importer.setObjectName("importer")
|
||||
importer.resize(694, 489)
|
||||
self.verticalLayout = QtWidgets.QVBoxLayout(importer)
|
||||
self.verticalLayout.setObjectName("verticalLayout")
|
||||
self.horizontalLayout = QtWidgets.QHBoxLayout()
|
||||
self.horizontalLayout.setObjectName("horizontalLayout")
|
||||
self.label = QtWidgets.QLabel(importer)
|
||||
self.label.setObjectName("label")
|
||||
self.horizontalLayout.addWidget(self.label)
|
||||
self.cmbImporters = QtWidgets.QComboBox(importer)
|
||||
self.cmbImporters.setObjectName("cmbImporters")
|
||||
self.horizontalLayout.addWidget(self.cmbImporters)
|
||||
self.btnManageImporters = QtWidgets.QPushButton(importer)
|
||||
icon = QtGui.QIcon.fromTheme("preferences-system")
|
||||
self.btnManageImporters.setIcon(icon)
|
||||
self.btnManageImporters.setObjectName("btnManageImporters")
|
||||
self.horizontalLayout.addWidget(self.btnManageImporters)
|
||||
spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
|
||||
self.horizontalLayout.addItem(spacerItem)
|
||||
self.btnChoseFile = QtWidgets.QPushButton(importer)
|
||||
icon = QtGui.QIcon.fromTheme("document-import")
|
||||
self.btnChoseFile.setIcon(icon)
|
||||
self.btnChoseFile.setObjectName("btnChoseFile")
|
||||
self.horizontalLayout.addWidget(self.btnChoseFile)
|
||||
self.btnPreview = QtWidgets.QPushButton(importer)
|
||||
icon = QtGui.QIcon.fromTheme("document-print-preview")
|
||||
self.btnPreview.setIcon(icon)
|
||||
self.btnPreview.setObjectName("btnPreview")
|
||||
self.horizontalLayout.addWidget(self.btnPreview)
|
||||
self.verticalLayout.addLayout(self.horizontalLayout)
|
||||
self.splitter = QtWidgets.QSplitter(importer)
|
||||
self.splitter.setOrientation(QtCore.Qt.Horizontal)
|
||||
self.splitter.setObjectName("splitter")
|
||||
self.grpSettings = QtWidgets.QGroupBox(self.splitter)
|
||||
self.grpSettings.setObjectName("grpSettings")
|
||||
self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.grpSettings)
|
||||
self.verticalLayout_3.setContentsMargins(0, 0, 0, 0)
|
||||
self.verticalLayout_3.setSpacing(0)
|
||||
self.verticalLayout_3.setObjectName("verticalLayout_3")
|
||||
self.grpPreview = QtWidgets.QGroupBox(self.splitter)
|
||||
self.grpPreview.setObjectName("grpPreview")
|
||||
self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.grpPreview)
|
||||
self.verticalLayout_2.setContentsMargins(0, 0, 0, 0)
|
||||
self.verticalLayout_2.setSpacing(0)
|
||||
self.verticalLayout_2.setObjectName("verticalLayout_2")
|
||||
self.verticalLayout.addWidget(self.splitter)
|
||||
|
||||
self.retranslateUi(importer)
|
||||
QtCore.QMetaObject.connectSlotsByName(importer)
|
||||
|
||||
def retranslateUi(self, importer):
|
||||
_translate = QtCore.QCoreApplication.translate
|
||||
importer.setWindowTitle(_translate("importer", "Import"))
|
||||
self.label.setText(_translate("importer", "Import from:"))
|
||||
self.btnManageImporters.setText(_translate("importer", "Manage importers"))
|
||||
self.btnChoseFile.setText(_translate("importer", "Chose file"))
|
||||
self.btnPreview.setText(_translate("importer", "Preview"))
|
||||
self.grpSettings.setTitle(_translate("importer", "Settings"))
|
||||
self.grpPreview.setTitle(_translate("importer", "Preview"))
|
||||
|
||||
133
manuskript/ui/importers/importer_ui.ui
Normal file
133
manuskript/ui/importers/importer_ui.ui
Normal file
|
|
@ -0,0 +1,133 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>importer</class>
|
||||
<widget class="QWidget" name="importer">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>694</width>
|
||||
<height>489</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Import</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Import from:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QComboBox" name="cmbImporters"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="btnManageImporters">
|
||||
<property name="text">
|
||||
<string>Manage importers</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset theme="preferences-system">
|
||||
<normaloff/>
|
||||
</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="btnChoseFile">
|
||||
<property name="text">
|
||||
<string>Chose file</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset theme="document-import"/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="btnPreview">
|
||||
<property name="text">
|
||||
<string>Preview</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset theme="document-print-preview">
|
||||
<normaloff/>
|
||||
</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QSplitter" name="splitter">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<widget class="QGroupBox" name="grpSettings">
|
||||
<property name="title">
|
||||
<string>Settings</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_3">
|
||||
<property name="spacing">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="leftMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="topMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="rightMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QGroupBox" name="grpPreview">
|
||||
<property name="title">
|
||||
<string>Preview</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||
<property name="spacing">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="leftMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="topMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="rightMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
|
|
@ -1189,12 +1189,17 @@ class Ui_MainWindow(object):
|
|||
icon = QtGui.QIcon.fromTheme("stock_view-details")
|
||||
self.actAbout.setIcon(icon)
|
||||
self.actAbout.setObjectName("actAbout")
|
||||
self.actImport = QtWidgets.QAction(MainWindow)
|
||||
icon = QtGui.QIcon.fromTheme("document-import")
|
||||
self.actImport.setIcon(icon)
|
||||
self.actImport.setObjectName("actImport")
|
||||
self.menuFile.addAction(self.actOpen)
|
||||
self.menuFile.addAction(self.menuRecents.menuAction())
|
||||
self.menuFile.addAction(self.actSave)
|
||||
self.menuFile.addAction(self.actSaveAs)
|
||||
self.menuFile.addAction(self.actCloseProject)
|
||||
self.menuFile.addSeparator()
|
||||
self.menuFile.addAction(self.actImport)
|
||||
self.menuFile.addAction(self.actCompile)
|
||||
self.menuFile.addSeparator()
|
||||
self.menuFile.addAction(self.actQuit)
|
||||
|
|
@ -1360,6 +1365,7 @@ class Ui_MainWindow(object):
|
|||
self.actToolFrequency.setText(_translate("MainWindow", "&Frequency Analyzer"))
|
||||
self.actAbout.setText(_translate("MainWindow", "&About"))
|
||||
self.actAbout.setToolTip(_translate("MainWindow", "About Manuskript"))
|
||||
self.actImport.setText(_translate("MainWindow", "Import…"))
|
||||
|
||||
from manuskript.ui.cheatSheet import cheatSheet
|
||||
from manuskript.ui.editors.mainEditor import mainEditor
|
||||
|
|
|
|||
|
|
@ -2116,6 +2116,7 @@
|
|||
<addaction name="actSaveAs"/>
|
||||
<addaction name="actCloseProject"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actImport"/>
|
||||
<addaction name="actCompile"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actQuit"/>
|
||||
|
|
@ -2482,6 +2483,14 @@ QListView::item:hover {
|
|||
<string>About Manuskript</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actImport">
|
||||
<property name="icon">
|
||||
<iconset theme="document-import"/>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Import…</string>
|
||||
</property>
|
||||
</action>
|
||||
</widget>
|
||||
<customwidgets>
|
||||
<customwidget>
|
||||
|
|
|
|||
Loading…
Reference in a new issue