Skip to content

Commit

Permalink
adjustments trying to fix read the docs
Browse files Browse the repository at this point in the history
  • Loading branch information
SanPen committed Oct 31, 2024
1 parent 4b3c7e0 commit c49b41b
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 112 deletions.
141 changes: 36 additions & 105 deletions .idea/workspace.xml

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions src/GridCal/Gui/AboutDialogue/gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,19 @@ def setupUi(self, AboutDialog):

self.versionLabel = QLabel(self.tab)
self.versionLabel.setObjectName(u"versionLabel")
self.versionLabel.setWordWrap(True)
self.versionLabel.setOpenExternalLinks(True)
self.versionLabel.setTextInteractionFlags(Qt.LinksAccessibleByMouse|Qt.TextSelectableByMouse)

self.gridLayout.addWidget(self.versionLabel, 3, 1, 1, 1)
self.gridLayout.addWidget(self.versionLabel, 3, 1, 1, 2)

self.copyrightLabel = QLabel(self.tab)
self.copyrightLabel.setObjectName(u"copyrightLabel")
self.copyrightLabel.setWordWrap(True)
self.copyrightLabel.setOpenExternalLinks(True)
self.copyrightLabel.setTextInteractionFlags(Qt.LinksAccessibleByMouse|Qt.TextSelectableByMouse)

self.gridLayout.addWidget(self.copyrightLabel, 4, 1, 1, 1)
self.gridLayout.addWidget(self.copyrightLabel, 4, 1, 1, 2)

self.tabWidget.addTab(self.tab, "")
self.tab_2 = QWidget()
Expand All @@ -85,6 +87,7 @@ def setupUi(self, AboutDialog):
self.contributorsLabel = QLabel(self.tab_2)
self.contributorsLabel.setObjectName(u"contributorsLabel")
self.contributorsLabel.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignTop)
self.contributorsLabel.setWordWrap(True)

self.verticalLayout.addWidget(self.contributorsLabel)

Expand Down
13 changes: 11 additions & 2 deletions src/GridCal/Gui/AboutDialogue/gui.ui
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,14 @@
</property>
</widget>
</item>
<item row="3" column="1">
<item row="3" column="1" colspan="2">
<widget class="QLabel" name="versionLabel">
<property name="text">
<string>version</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
Expand All @@ -119,11 +122,14 @@
</property>
</widget>
</item>
<item row="4" column="1">
<item row="4" column="1" colspan="2">
<widget class="QLabel" name="copyrightLabel">
<property name="text">
<string>Copyright</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
Expand All @@ -147,6 +153,9 @@
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
Expand Down
2 changes: 1 addition & 1 deletion src/GridCal/__version__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
_current_year_ = datetime.datetime.now().year

# do not forget to keep a three-number version!!!
__GridCal_VERSION__ = "6.0.0"
__GridCal_VERSION__ = "5.1.60"

url = 'https://github.com/SanPen/GridCal'

Expand Down
2 changes: 2 additions & 0 deletions src/GridCalEngine/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
from GridCalEngine.enumerations import *
except ModuleNotFoundError as e:
print("Modules not found :/", e)
except NameError as e:
print("Name not found :/", e)


def open_file(filename: Union[str, List[str]]) -> MultiCircuit:
Expand Down
2 changes: 1 addition & 1 deletion src/GridCalEngine/__version__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
_current_year_ = datetime.datetime.now().year

# do not forget to keep a three-number version!!!
__GridCalEngine_VERSION__ = "6.0.0"
__GridCalEngine_VERSION__ = "5.1.60"

url = 'https://github.com/SanPen/GridCal'

Expand Down
2 changes: 1 addition & 1 deletion src/GridCalServer/__version__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
_current_year_ = datetime.datetime.now().year

# do not forget to keep a three-number version!!!
__GridCalServer_VERSION__ = "6.0.0"
__GridCalServer_VERSION__ = "5.1.60"

url = 'https://github.com/SanPen/GridCal'

Expand Down

0 comments on commit c49b41b

Please sign in to comment.