Skip to content

Commit

Permalink
new code adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
@VitorVieiraZ
VitorVieiraZ committed Nov 12, 2024
1 parent b187b78 commit 0edb653
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 77 deletions.
32 changes: 24 additions & 8 deletions Mergin/project_limit_hit_dialog.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,35 @@

ui_file = os.path.join(os.path.dirname(os.path.realpath(__file__)), "ui", "ui_project_limit_hit_dialog.ui")


class ProjectLimitHitDialog(QDialog):
def __init__(self, e, parent=None):
QDialog.__init__(self, parent)
self.ui = uic.loadUi(ui_file, self)

quota = e.server_response.get('projects_quota', 'N/A')
plan = e.server_response.get('plan', 'N/A')
self.planQuota_label.setText(str(quota))
self.planName_label.setText(str(plan))


self.server_response = e.server_response
self.setDialogStyle()

self.cancel_btn.clicked.connect(self.reject)
self.upgrade_plan_btn.clicked.connect(self.open_upgrade_link)


def setDialogStyle(self):
quota = self.server_response.get("projects_quota", "N/A")
quota_text = f"{quota}/{quota}"

self.plan_quota_progress_bar.setFormat(quota_text)
self.plan_quota_progress_bar.setStyleSheet(
"""
QProgressBar {
border: none;
text-align: center;
}
QProgressBar::chunk {
background-color: rgb(0, 76, 69);
}
"""
)

def open_upgrade_link(self):
QDesktopServices.openUrl(QUrl("https://www.merginmaps.com/pricing"))
self.accept()
self.accept()
1 change: 1 addition & 0 deletions Mergin/projects_manager.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
from .project_status_dialog import ProjectStatusDialog
from .project_limit_hit_dialog import ProjectLimitHitDialog


class MerginProjectsManager(object):
"""Class for managing Mergin Maps projects in QGIS."""

Expand Down
132 changes: 63 additions & 69 deletions Mergin/ui/ui_project_limit_hit_dialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<rect>
<x>0</x>
<y>0</y>
<width>332</width>
<height>278</height>
<width>352</width>
<height>224</height>
</rect>
</property>
<property name="windowTitle">
<string>Project limit hit</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
Expand All @@ -30,7 +30,7 @@
</font>
</property>
<property name="text">
<string>You have reached the maximum limit of active monthly contributors for your subscription.</string>
<string>You've reached the maximum number of active monthly contributors for your current subscription.</string>
</property>
<property name="textFormat">
<enum>Qt::AutoText</enum>
Expand All @@ -43,80 +43,41 @@
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Upgrade your subscription or wait until next month
for refresh of slots.</string>
<item row="3" column="0">
<widget class="QProgressBar" name="plan_quota_progress_bar">
<property name="enabled">
<bool>true</bool>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
<property name="minimumSize">
<size>
<width>0</width>
<height>15</height>
</size>
</property>
<property name="sizeHint" stdset="0">
<property name="maximumSize">
<size>
<width>20</width>
<height>40</height>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="baseSize">
<size>
<width>0</width>
<height>15</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Used</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="planQuota_label">
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QProgressBar" name="plan_quota_progress_bar">
<property name="value">
<number>100</number>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label_6">
<property name="text">
<string>Plan</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="planName_label">
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</item>
<item>
<item row="5" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QPushButton" name="cancel_btn">
Expand All @@ -133,8 +94,11 @@ for refresh of slots.</string>
</item>
<item>
<widget class="QPushButton" name="upgrade_plan_btn">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
Expand All @@ -151,12 +115,42 @@ for refresh of slots.</string>
<height>16777215</height>
</size>
</property>
<property name="font">
<font>
<kerning>true</kerning>
</font>
</property>
<property name="text">
<string>Upgrade</string>
</property>
<property name="default">
<bool>true</bool>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Upgrade your subscription or wait until next month
for the limit to reset.</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="2" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Used</string>
</property>
</widget>
</item>
</layout>
Expand Down

0 comments on commit 0edb653

Please sign in to comment.