Changeset 1729
- Timestamp:
- Mon Oct 17 17:41:39 2005
- Files:
-
- trunk/livesupport/src/products/gLiveSupport/src/UploadFileWindow.cxx (modified) (diff)
- trunk/livesupport/src/products/gLiveSupport/src/UploadFileWindow.h (modified) (diff)
- trunk/livesupport/src/products/gLiveSupport/var/root.txt (modified) (diff)
- trunk/livesupport/src/products/gLiveSupport/var/pl.txt (modified) (diff)
- trunk/livesupport/src/products/gLiveSupport/etc/gLiveSupport.xml (modified) (diff)
- trunk/livesupport/src/products/gLiveSupport/etc/gLiveSupport.xml.user-template (modified) (diff)
- trunk/livesupport/src/products/gLiveSupport/etc/gLiveSupport.xml.template (modified) (diff)
- trunk/livesupport/src/modules/core/include/LiveSupport/Core/MetadataType.h (modified) (diff)
- trunk/livesupport/src/modules/core/src/MetadataType.cxx (modified) (diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
trunk/livesupport/src/products/gLiveSupport/src/UploadFileWindow.cxx
r1698 r1729 91 91 mainTable = Gtk::manage(new Gtk::Table()); 92 92 musicTable = Gtk::manage(new Gtk::Table()); 93 talkTable = Gtk::manage(new Gtk::Table());93 voiceTable = Gtk::manage(new Gtk::Table()); 93 93 94 94 Ptr<MetadataTypeContainer>::Ref … … 98 98 int mainCounter = 0; 99 99 int musicCounter = 0; 100 int talkCounter = 0;100 int voiceCounter = 0; 100 100 for (it = metadataTypes->begin(); it != metadataTypes->end(); ++it) { 101 101 Ptr<const MetadataType>::Ref metadata = *it; … … 132 132 break; 133 133 134 case MetadataType::talkTab : 135 talkTable->attach(*metadataName, 0, 1, 136 talkCounter, talkCounter + 1); 137 talkTable->attach(*metadataEntryBin, 1, 2, 138 talkCounter, talkCounter + 1); 139 ++talkCounter; 134 case MetadataType::voiceTab : 135 voiceTable->attach(*metadataName, 0, 1, 136 voiceCounter, voiceCounter + 1); 137 voiceTable->attach(*metadataEntryBin, 1, 2, 138 voiceCounter, voiceCounter + 1); 139 ++voiceCounter; 140 140 break; 141 141 … … 173 173 musicTable->set_row_spacings(2); 174 174 musicTable->set_col_spacings(5); 175 talkTable->set_row_spacings(2); 176 talkTable->set_col_spacings(5); 175 voiceTable->set_row_spacings(2); 176 voiceTable->set_col_spacings(5); 177 177 178 178 // expand the input fields horizontally, but shrink-wrap vertically … … 181 181 Gtk::Alignment * musicAlignment = Gtk::manage(new Gtk::Alignment( 182 182 0.0, 0.0, 1.0, 0.0)); 183 Gtk::Alignment * talkAlignment = Gtk::manage(new Gtk::Alignment(183 Gtk::Alignment * voiceAlignment = Gtk::manage(new Gtk::Alignment( 183 183 0.0, 0.0, 1.0, 0.0)); 184 184 185 185 mainAlignment->add(*mainTable); 186 186 musicAlignment->add(*musicTable); 187 talkAlignment->add(*talkTable);187 voiceAlignment->add(*voiceTable); 187 187 188 188 ScrolledWindow * mainScrolledWindow … … 192 192 ScrolledWindow * musicScrolledWindow 193 193 = Gtk::manage(new ScrolledWindow()); 194 ScrolledWindow * talkScrolledWindow194 ScrolledWindow * voiceScrolledWindow 194 194 = Gtk::manage(new ScrolledWindow()); 195 195 … … 199 199 musicScrolledWindow->set_policy(Gtk::POLICY_AUTOMATIC, 200 200 Gtk::POLICY_AUTOMATIC); 201 talkScrolledWindow->set_policy(Gtk::POLICY_AUTOMATIC,201 voiceScrolledWindow->set_policy(Gtk::POLICY_AUTOMATIC, 201 201 Gtk::POLICY_AUTOMATIC); 202 202 203 203 mainScrolledWindow->add(*mainAlignment); 204 204 musicScrolledWindow->add(*musicAlignment); 205 talkScrolledWindow->add(*talkAlignment);205 voiceScrolledWindow->add(*voiceAlignment); 205 205 206 206 try { 211 211 metadataNotebook->appendPage(*musicScrolledWindow, 212 212 *getResourceUstring("musicSectionLabel")); 213 metadataNotebook->appendPage(*talkScrolledWindow, 214 *getResourceUstring("talkSectionLabel")); 213 metadataNotebook->appendPage(*voiceScrolledWindow, 214 *getResourceUstring("voiceSectionLabel")); 215 215 } catch (std::invalid_argument &e) { 216 216 // TODO: signal error -
trunk/livesupport/src/products/gLiveSupport/src/UploadFileWindow.h
r1698 r1729 135 135 136 136 /** 137 * The layout of the talksection.137 * The layout of the voice section. 137 137 */ 138 Gtk::Table * talkTable;138 Gtk::Table * voiceTable; 138 138 139 139 /** -
trunk/livesupport/src/products/gLiveSupport/var/root.txt
r1578 r1729 104 104 mainSectionLabel:string { "Main" } 105 105 musicSectionLabel:string { "Music" } 106 talkSectionLabel:string { "Talk" }106 voiceSectionLabel:string { "Voice" } 106 106 107 107 lengthLabel:string { "Duration" } -
trunk/livesupport/src/products/gLiveSupport/var/pl.txt
r1611 r1729 104 104 mainSectionLabel:string { "Start" } 105 105 musicSectionLabel:string { "Muzyka" } 106 talkSectionLabel:string{ "Audycja" }106 voiceSectionLabel:string { "Audycja" } 106 106 107 107 lengthLabel:string { "Długość" } -
trunk/livesupport/src/products/gLiveSupport/etc/gLiveSupport.xml
r1611 r1729 312 312 <metadataType dcName = "dcterms:temporal" 313 313 localizationKey = "report_date_time" 314 tab = " talk"314 tab = "voice" 314 314 /> 315 315 <metadataType dcName = "dcterms:spatial" 316 316 localizationKey = "report_location" 317 tab = " talk"317 tab = "voice" 317 317 /> 318 318 <metadataType dcName = "dcterms:entity" 319 319 localizationKey = "report_organizations" 320 tab = " talk"320 tab = "voice" 320 320 /> 321 321 <metadataType dcName = "dc:subject" 322 322 localizationKey = "subject" 323 tab = " talk"323 tab = "voice" 323 323 /> 324 324 </metadataTypeContainer> -
trunk/livesupport/src/products/gLiveSupport/etc/gLiveSupport.xml.user-template
r1611 r1729 312 312 <metadataType dcName = "dcterms:temporal" 313 313 localizationKey = "report_date_time" 314 tab = " talk"314 tab = "voice" 314 314 /> 315 315 <metadataType dcName = "dcterms:spatial" 316 316 localizationKey = "report_location" 317 tab = " talk"317 tab = "voice" 317 317 /> 318 318 <metadataType dcName = "dcterms:entity" 319 319 localizationKey = "report_organizations" 320 tab = " talk"320 tab = "voice" 320 320 /> 321 321 <metadataType dcName = "dc:subject" 322 322 localizationKey = "subject" 323 tab = " talk"323 tab = "voice" 323 323 /> 324 324 </metadataTypeContainer> -
trunk/livesupport/src/products/gLiveSupport/etc/gLiveSupport.xml.template
r1611 r1729 312 312 <metadataType dcName = "dcterms:temporal" 313 313 localizationKey = "report_date_time" 314 tab = " talk"314 tab = "voice" 314 314 /> 315 315 <metadataType dcName = "dcterms:spatial" 316 316 localizationKey = "report_location" 317 tab = " talk"317 tab = "voice" 317 317 /> 318 318 <metadataType dcName = "dcterms:entity" 319 319 localizationKey = "report_organizations" 320 tab = " talk"320 tab = "voice" 320 320 /> 321 321 <metadataType dcName = "dc:subject" 322 322 localizationKey = "subject" 323 tab = " talk"323 tab = "voice" 323 323 /> 324 324 </metadataTypeContainer> -
trunk/livesupport/src/modules/core/include/LiveSupport/Core/MetadataType.h
r1601 r1729 76 76 * </code></pre> 77 77 * 78 * The tab attribute (if present) must be one of "main", "music" or " talk"78 * The tab attribute (if present) must be one of "main", "music" or "voice" 78 78 * (all lowercase, case sensitive). 79 79 * This determines whether, at file upload, the metadata field appears in 80 * the Main, Music, or Talktab. If the attribute is omitted, the metadata80 * the Main, Music, or Voice tab. If the attribute is omitted, the metadata 80 80 * field will appear in none of the tabs. 81 81 * 108 108 mainTab, 109 109 musicTab, 110 talkTab } TabType;110 voiceTab } TabType; 110 110 111 111 -
trunk/livesupport/src/modules/core/src/MetadataType.cxx
r1601 r1729 146 146 } else if (tabString == "music") { 147 147 tab = musicTab; 148 } else if (tabString == "talk") { 149 tab = talkTab; 148 } else if (tabString == "voice") { 149 tab = voiceTab; 150 150 } 151 151 }