Ticket #7791: mythgallery-buttonlist-marking.patch
File mythgallery-buttonlist-marking.patch, 8.9 KB (added by , 14 years ago) |
---|
-
mythgallery/mythgallery/iconview.cpp
439 439 { 440 440 if (!m_itemMarked.contains(thumbitem->GetPath())) 441 441 { 442 m_itemMarked.append(thumbitem->GetPath()); 443 item->setChecked(MythUIButtonListItem::FullChecked); 442 HandleSelectOne(); 443 //m_itemMarked.append(thumbitem->GetPath()); 444 //item->setChecked(MythUIButtonListItem::FullChecked); 444 445 } 445 446 else 446 447 { 447 m_itemMarked.removeAll(thumbitem->GetPath()); 448 item->setChecked(MythUIButtonListItem::NotChecked); 448 HandleClearOneMarked(); 449 //m_itemMarked.removeAll(thumbitem->GetPath()); 450 //item->setChecked(MythUIButtonListItem::NotChecked); 449 451 } 450 452 } 451 453 } … … 729 731 } 730 732 delete ccd; 731 733 } 732 else if (event->type() == kMythDialogBoxCompletionEventType)733 {734 DialogCompletionEvent *dce =735 dynamic_cast<DialogCompletionEvent*>(event);736 737 QString resultid= dce->GetId();738 int buttonnum = dce->GetResult();739 740 if (resultid == "mainmenu")741 {742 switch (buttonnum)743 {744 case 0:745 HandleSlideShow();746 break;747 case 1:748 HandleRandomShow();749 break;750 case 2:751 HandleSubMenuMetadata();752 break;753 case 3:754 HandleSubMenuMark();755 break;756 case 4:757 HandleSubMenuFile();758 break;759 case 5:760 HandleSettings();761 break;762 }763 }764 else if (resultid == "metadatamenu")765 {766 switch (buttonnum)767 {768 case 0:769 HandleRotateCW();770 break;771 case 1:772 HandleRotateCCW();773 break;774 }775 }776 else if (resultid == "markingmenu")777 {778 switch (buttonnum)779 {780 case 0:781 HandleClearMarked();782 break;783 case 1:784 HandleSelectAll();785 break;786 }787 }788 else if (resultid == "filemenu")789 {790 switch (buttonnum)791 {792 case 0:793 HandleShowDevices();794 break;795 case 1:796 HandleEject();797 break;798 case 2:799 HandleImport();800 break;801 case 3:802 HandleCopyHere();803 break;804 case 4:805 HandleMoveHere();806 break;807 case 5:808 HandleDelete();809 break;810 case 6:811 HandleMkDir();812 break;813 case 7:814 HandleRename();815 break;816 }817 }818 819 m_menuPopup = NULL;820 821 }822 823 734 } 824 735 825 736 void IconView::HandleMainMenu(void) … … 828 739 829 740 m_menuPopup = new MythDialogBox(label, m_popupStack, "mythgallerymenupopup"); 830 741 831 if (!m_menuPopup->Create()) 832 { 833 delete m_menuPopup; 834 m_menuPopup = NULL; 835 return; 836 } 742 if (m_menuPopup->Create()) 743 m_popupStack->AddScreen(m_menuPopup); 837 744 838 745 m_menuPopup->SetReturnEvent(this, "mainmenu"); 839 746 840 m_menuPopup->AddButton(tr("SlideShow") );841 m_menuPopup->AddButton(tr("Random") );842 m_menuPopup->AddButton(tr("Meta Data Menu") );843 m_menuPopup->AddButton(tr("Marking Menu") );844 m_menuPopup->AddButton(tr("File Menu") );845 m_menuPopup->AddButton(tr("Settings") );747 m_menuPopup->AddButton(tr("SlideShow"), SLOT(HandleSlideShow())); 748 m_menuPopup->AddButton(tr("Random"), SLOT(HandleRandomShow())); 749 m_menuPopup->AddButton(tr("Meta Data Menu"), SLOT(HandleSubMenuMetadata()), true); 750 m_menuPopup->AddButton(tr("Marking Menu"), SLOT(HandleSubMenuMark()), true); 751 m_menuPopup->AddButton(tr("File Menu"), SLOT(HandleSubMenuFile()), true); 752 m_menuPopup->AddButton(tr("Settings"), SLOT(HandleSettings())); 846 753 // if (m_showDevices) 847 754 // { 848 755 // QDir d(m_currDir); … … 852 759 // LoadDirectory(m_currDir); 853 760 // m_showDevices = false; 854 761 // } 855 856 m_popupStack->AddScreen(m_menuPopup);857 762 } 858 763 859 764 void IconView::HandleSubMenuMetadata(void) … … 867 772 868 773 m_menuPopup->SetReturnEvent(this, "metadatamenu"); 869 774 870 m_menuPopup->AddButton(tr("Rotate CW") );871 m_menuPopup->AddButton(tr("Rotate CCW") );775 m_menuPopup->AddButton(tr("Rotate CW"), SLOT(HandleRotateCW())); 776 m_menuPopup->AddButton(tr("Rotate CCW"), SLOT(HandleRotateCCW())); 872 777 } 873 778 874 779 void IconView::HandleSubMenuMark(void) … … 882 787 883 788 m_menuPopup->SetReturnEvent(this, "markingmenu"); 884 789 885 m_menuPopup->AddButton(tr("Clear Marked")); 886 m_menuPopup->AddButton(tr("Select All")); 790 m_menuPopup->AddButton(tr("Select One"), SLOT(HandleSelectOne())); 791 m_menuPopup->AddButton(tr("Clear Marked"), SLOT(HandleClearOneMarked())); 792 m_menuPopup->AddButton(tr("Select All"), SLOT(HandleSelectAll())); 793 m_menuPopup->AddButton(tr("Clear All Marked"), SLOT(HandleClearAllMarked())); 887 794 } 888 795 889 796 void IconView::HandleSubMenuFile(void) … … 897 804 898 805 m_menuPopup->SetReturnEvent(this, "filemenu"); 899 806 900 m_menuPopup->AddButton(tr("Show Devices") );901 m_menuPopup->AddButton(tr("Eject") );902 m_menuPopup->AddButton(tr("Import") );903 m_menuPopup->AddButton(tr("Copy here") );904 m_menuPopup->AddButton(tr("Move here") );905 m_menuPopup->AddButton(tr("Delete") );906 m_menuPopup->AddButton(tr("Create Dir") );907 m_menuPopup->AddButton(tr("Rename") );807 m_menuPopup->AddButton(tr("Show Devices"), SLOT(HandleShowDevices())); 808 m_menuPopup->AddButton(tr("Eject"), SLOT(HandleEject())); 809 m_menuPopup->AddButton(tr("Import"), SLOT(HandleImport())); 810 m_menuPopup->AddButton(tr("Copy here"), SLOT(HandleCopyHere())); 811 m_menuPopup->AddButton(tr("Move here"), SLOT(HandleMoveHere())); 812 m_menuPopup->AddButton(tr("Delete"), SLOT(HandleDelete())); 813 m_menuPopup->AddButton(tr("Create Dir"), SLOT(HandleMkDir())); 814 m_menuPopup->AddButton(tr("Rename"), SLOT(HandleRename())); 908 815 } 909 816 910 817 void IconView::HandleRotateCW(void) … … 1133 1040 void IconView::HandleCopyHere(void) 1134 1041 { 1135 1042 CopyMarkedFiles(false); 1136 HandleClear Marked();1043 HandleClearAllMarked(); 1137 1044 } 1138 1045 1139 1046 void IconView::HandleMoveHere(void) 1140 1047 { 1141 1048 CopyMarkedFiles(true); 1142 HandleClear Marked();1049 HandleClearAllMarked(); 1143 1050 } 1144 1051 1145 1052 void IconView::HandleDelete(void) … … 1178 1085 } 1179 1086 } 1180 1087 1181 void IconView::HandleClearMarked(void) 1088 void IconView::HandleClearOneMarked(void) 1089 { 1090 int pos = m_imageList->GetCurrentPos(); 1091 1092 ThumbItem *item = GetCurrentThumb(); 1093 if (m_itemMarked.contains(item->GetPath())) 1094 m_itemMarked.removeOne(item->GetPath()); 1095 1096 m_imageList->SetChecked(MythUIButtonListItem::NotChecked, pos); 1097 } 1098 1099 void IconView::HandleClearAllMarked(void) 1182 1100 { 1183 1101 m_itemMarked.clear(); 1184 1102 m_imageList->SetAllChecked(MythUIButtonListItem::NotChecked); 1185 1103 } 1186 1104 1105 void IconView::HandleSelectOne(void) 1106 { 1107 int pos = m_imageList->GetCurrentPos(); 1108 1109 ThumbItem *item = GetCurrentThumb(); 1110 if (m_itemMarked.contains(item->GetPath())) 1111 m_itemMarked.removeOne(item->GetPath()); 1112 1113 m_imageList->SetChecked(MythUIButtonListItem::FullChecked, pos); 1114 } 1115 1187 1116 void IconView::HandleSelectAll(void) 1188 1117 { 1189 1118 ThumbItem *item; -
mythgallery/mythgallery/iconview.h
73 73 bool HandleMediaDeviceSelect(ThumbItem *item); 74 74 bool HandleImageSelect(const QString &action); 75 75 76 private slots: 76 77 void HandleMainMenu(void); 77 78 void HandleSubMenuMetadata(void); 78 79 void HandleSubMenuMark(void); 79 80 void HandleSubMenuFile(void); 80 81 private slots:82 81 void HandleRotateCW(void); 83 82 void HandleRotateCCW(void); 84 83 void HandleDeleteCurrent(void); … … 92 91 void HandleMoveHere(void); 93 92 void HandleDelete(void); 94 93 void HandleDeleteMarked(void); 95 void HandleClearMarked(void); 94 void HandleClearOneMarked(void); 95 void HandleSelectOne(void); 96 void HandleClearAllMarked(void); 96 97 void HandleSelectAll(void); 97 98 void HandleMkDir(void); 98 99 void HandleRename(void);