Skip to content

Commit ddcfb49

Browse files
yesiahyesiah
committed
Rename generate button
1 parent c50f541 commit ddcfb49

3 files changed

+208
-157
lines changed

‎contract_generator.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ def on_other_code_button_group_toggled(self, button, checked):
350350

351351
def check_mandatory_fields(self):
352352
print("check")
353-
self.ui.execute_button.setEnabled(False)
353+
self.ui.generate_button.setEnabled(False)
354354
if self.ui.lang_selector.currentIndex() == -1 or self.ui.contract_template_selector.currentIndex() == -1:
355355
print("lang wrong")
356356
return
@@ -433,9 +433,9 @@ def check_mandatory_fields(self):
433433
print("other code empty")
434434
return
435435

436-
self.ui.execute_button.setEnabled(True)
436+
self.ui.generate_button.setEnabled(True)
437437

438-
def on_execute(self):
438+
def on_generate(self):
439439
md = self.get_markdown()
440440
html = markdown(md)
441441
# TODO decide where to store files

‎contract_generator.ui

+130-91
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<string>Contract Generator</string>
1515
</property>
1616
<widget class="QWidget" name="centralwidget">
17-
<widget class="QPushButton" name="execute_button">
17+
<widget class="QPushButton" name="generate_button">
1818
<property name="enabled">
1919
<bool>false</bool>
2020
</property>
@@ -27,7 +27,7 @@
2727
</rect>
2828
</property>
2929
<property name="text">
30-
<string>Execute</string>
30+
<string>Generate</string>
3131
</property>
3232
</widget>
3333
<widget class="QScrollArea" name="scrollArea">
@@ -525,35 +525,68 @@
525525
</item>
526526
<item>
527527
<layout class="QGridLayout" name="gridLayout_2">
528-
<item row="1" column="2">
529-
<widget class="QComboBox" name="currency_selector">
528+
<item row="0" column="11">
529+
<spacer name="horizontalSpacer_8">
530+
<property name="orientation">
531+
<enum>Qt::Horizontal</enum>
532+
</property>
533+
<property name="sizeHint" stdset="0">
534+
<size>
535+
<width>40</width>
536+
<height>20</height>
537+
</size>
538+
</property>
539+
</spacer>
540+
</item>
541+
<item row="1" column="5">
542+
<widget class="QGroupBox" name="cross_border_payment_group">
530543
<property name="enabled">
531544
<bool>false</bool>
532545
</property>
533-
<property name="currentIndex">
534-
<number>-1</number>
546+
<property name="minimumSize">
547+
<size>
548+
<width>0</width>
549+
<height>50</height>
550+
</size>
535551
</property>
536-
<property name="placeholderText">
537-
<string>--- Currency ---</string>
552+
<property name="title">
553+
<string>Cross Border Payment</string>
538554
</property>
539-
<item>
540-
<property name="text">
541-
<string>NTD</string>
542-
</property>
543-
</item>
544-
<item>
545-
<property name="text">
546-
<string>USD</string>
547-
</property>
548-
</item>
549-
<item>
550-
<property name="text">
551-
<string>JPY</string>
555+
<widget class="QWidget" name="horizontalLayoutWidget_2">
556+
<property name="geometry">
557+
<rect>
558+
<x>10</x>
559+
<y>20</y>
560+
<width>131</width>
561+
<height>31</height>
562+
</rect>
552563
</property>
553-
</item>
564+
<layout class="QHBoxLayout" name="horizontalLayout">
565+
<item>
566+
<widget class="QRadioButton" name="cross_border_payment_yes">
567+
<property name="text">
568+
<string>Yes</string>
569+
</property>
570+
<attribute name="buttonGroup">
571+
<string notr="true">cross_border_payment_button_group</string>
572+
</attribute>
573+
</widget>
574+
</item>
575+
<item>
576+
<widget class="QRadioButton" name="cross_border_payment_no">
577+
<property name="text">
578+
<string>No</string>
579+
</property>
580+
<attribute name="buttonGroup">
581+
<string notr="true">cross_border_payment_button_group</string>
582+
</attribute>
583+
</widget>
584+
</item>
585+
</layout>
586+
</widget>
554587
</widget>
555588
</item>
556-
<item row="1" column="1">
589+
<item row="1" column="3">
557590
<widget class="QLabel" name="currency_label">
558591
<property name="enabled">
559592
<bool>false</bool>
@@ -566,8 +599,8 @@
566599
</property>
567600
</widget>
568601
</item>
569-
<item row="0" column="7">
570-
<spacer name="horizontalSpacer_8">
602+
<item row="0" column="1">
603+
<spacer name="horizontalSpacer_6">
571604
<property name="orientation">
572605
<enum>Qt::Horizontal</enum>
573606
</property>
@@ -580,7 +613,7 @@
580613
</spacer>
581614
</item>
582615
<item row="0" column="5">
583-
<spacer name="horizontalSpacer_5">
616+
<spacer name="horizontalSpacer">
584617
<property name="orientation">
585618
<enum>Qt::Horizontal</enum>
586619
</property>
@@ -592,8 +625,18 @@
592625
</property>
593626
</spacer>
594627
</item>
595-
<item row="0" column="0">
596-
<spacer name="horizontalSpacer_6">
628+
<item row="0" column="4">
629+
<widget class="QComboBox" name="payment_method_selector">
630+
<property name="enabled">
631+
<bool>false</bool>
632+
</property>
633+
<property name="placeholderText">
634+
<string>--- Payment Method ---</string>
635+
</property>
636+
</widget>
637+
</item>
638+
<item row="0" column="8">
639+
<spacer name="horizontalSpacer_11">
597640
<property name="orientation">
598641
<enum>Qt::Horizontal</enum>
599642
</property>
@@ -605,7 +648,7 @@
605648
</property>
606649
</spacer>
607650
</item>
608-
<item row="0" column="4">
651+
<item row="0" column="6">
609652
<spacer name="horizontalSpacer_3">
610653
<property name="orientation">
611654
<enum>Qt::Horizontal</enum>
@@ -618,8 +661,8 @@
618661
</property>
619662
</spacer>
620663
</item>
621-
<item row="0" column="6">
622-
<spacer name="horizontalSpacer_7">
664+
<item row="0" column="12">
665+
<spacer name="horizontalSpacer_9">
623666
<property name="orientation">
624667
<enum>Qt::Horizontal</enum>
625668
</property>
@@ -631,18 +674,21 @@
631674
</property>
632675
</spacer>
633676
</item>
634-
<item row="0" column="1">
635-
<widget class="QLabel" name="payment_method_label">
636-
<property name="enabled">
637-
<bool>false</bool>
677+
<item row="0" column="2">
678+
<spacer name="horizontalSpacer_10">
679+
<property name="orientation">
680+
<enum>Qt::Horizontal</enum>
638681
</property>
639-
<property name="text">
640-
<string>Payment Method</string>
682+
<property name="sizeHint" stdset="0">
683+
<size>
684+
<width>40</width>
685+
<height>20</height>
686+
</size>
641687
</property>
642-
</widget>
688+
</spacer>
643689
</item>
644-
<item row="0" column="8">
645-
<spacer name="horizontalSpacer_9">
690+
<item row="0" column="10">
691+
<spacer name="horizontalSpacer_7">
646692
<property name="orientation">
647693
<enum>Qt::Horizontal</enum>
648694
</property>
@@ -654,18 +700,46 @@
654700
</property>
655701
</spacer>
656702
</item>
657-
<item row="0" column="2">
658-
<widget class="QComboBox" name="payment_method_selector">
703+
<item row="0" column="3">
704+
<widget class="QLabel" name="payment_method_label">
705+
<property name="enabled">
706+
<bool>false</bool>
707+
</property>
708+
<property name="text">
709+
<string>Payment Method</string>
710+
</property>
711+
</widget>
712+
</item>
713+
<item row="1" column="4">
714+
<widget class="QComboBox" name="currency_selector">
659715
<property name="enabled">
660716
<bool>false</bool>
661717
</property>
718+
<property name="currentIndex">
719+
<number>-1</number>
720+
</property>
662721
<property name="placeholderText">
663-
<string>--- Payment Method ---</string>
722+
<string>--- Currency ---</string>
664723
</property>
724+
<item>
725+
<property name="text">
726+
<string>NTD</string>
727+
</property>
728+
</item>
729+
<item>
730+
<property name="text">
731+
<string>USD</string>
732+
</property>
733+
</item>
734+
<item>
735+
<property name="text">
736+
<string>JPY</string>
737+
</property>
738+
</item>
665739
</widget>
666740
</item>
667-
<item row="0" column="3">
668-
<spacer name="horizontalSpacer">
741+
<item row="0" column="9">
742+
<spacer name="horizontalSpacer_5">
669743
<property name="orientation">
670744
<enum>Qt::Horizontal</enum>
671745
</property>
@@ -677,53 +751,18 @@
677751
</property>
678752
</spacer>
679753
</item>
680-
<item row="1" column="3">
681-
<widget class="QGroupBox" name="cross_border_payment_group">
682-
<property name="enabled">
683-
<bool>false</bool>
754+
<item row="0" column="7">
755+
<spacer name="horizontalSpacer_12">
756+
<property name="orientation">
757+
<enum>Qt::Horizontal</enum>
684758
</property>
685-
<property name="minimumSize">
759+
<property name="sizeHint" stdset="0">
686760
<size>
687-
<width>0</width>
688-
<height>50</height>
761+
<width>40</width>
762+
<height>20</height>
689763
</size>
690764
</property>
691-
<property name="title">
692-
<string>Cross Border Payment</string>
693-
</property>
694-
<widget class="QWidget" name="horizontalLayoutWidget_2">
695-
<property name="geometry">
696-
<rect>
697-
<x>10</x>
698-
<y>20</y>
699-
<width>131</width>
700-
<height>31</height>
701-
</rect>
702-
</property>
703-
<layout class="QHBoxLayout" name="horizontalLayout">
704-
<item>
705-
<widget class="QRadioButton" name="cross_border_payment_yes">
706-
<property name="text">
707-
<string>Yes</string>
708-
</property>
709-
<attribute name="buttonGroup">
710-
<string notr="true">cross_border_payment_button_group</string>
711-
</attribute>
712-
</widget>
713-
</item>
714-
<item>
715-
<widget class="QRadioButton" name="cross_border_payment_no">
716-
<property name="text">
717-
<string>No</string>
718-
</property>
719-
<attribute name="buttonGroup">
720-
<string notr="true">cross_border_payment_button_group</string>
721-
</attribute>
722-
</widget>
723-
</item>
724-
</layout>
725-
</widget>
726-
</widget>
765+
</spacer>
727766
</item>
728767
</layout>
729768
</item>
@@ -1379,10 +1418,10 @@
13791418
</hints>
13801419
</connection>
13811420
<connection>
1382-
<sender>execute_button</sender>
1421+
<sender>generate_button</sender>
13831422
<signal>clicked()</signal>
13841423
<receiver>MainWindow</receiver>
1385-
<slot>on_execute()</slot>
1424+
<slot>on_generate()</slot>
13861425
<hints>
13871426
<hint type="sourcelabel">
13881427
<x>333</x>
@@ -1465,9 +1504,9 @@
14651504
<slot>on_payment_method_selector_changed()</slot>
14661505
<slot>check_mandatory_fields()</slot>
14671506
<slot>on_party_a_name_selector_changed()</slot>
1468-
<slot>on_execute()</slot>
14691507
<slot>on_cross_border_payment_button_group_toggled(QAbstractButton*,bool)</slot>
14701508
<slot>on_other_code_button_group_toggled(QAbstractButton*,bool)</slot>
1509+
<slot>on_generate()</slot>
14711510
</slots>
14721511
<buttongroups>
14731512
<buttongroup name="cross_border_payment_button_group"/>

0 commit comments

Comments
 (0)