Commit 434c83880d0ae6fa1ac1c857e9da6c4922f285bb

Forgot to remove the moodbar for 1.4.3.

svn path=/tags/amarok/1.4.3/multimedia/amarok/; revision=581028
src/Options1.ui
(7 / 216)
  
4949 <cstring>kcfg_ShowSplashscreen</cstring>
5050 </property>
5151 <property name="text">
52 <string>Sho&amp;w splash-screen on startup</string>
52 <string>Show splash-screen &amp;on startup</string>
5353 </property>
5454 <property name="toolTip" stdset="0">
5555 <string>Check to enable the splashscreen during Amarok startup.</string>
……
105105 <bool>false</bool>
106106 </property>
107107 <property name="text">
108 <string>&amp;Flash tray icon when playing</string>
108 <string>Flash tray i&amp;con when playing</string>
109109 </property>
110110 <property name="toolTip" stdset="0">
111111 <string>Check to animate the Amarok system tray icon.</string>
……
121121 <cstring>kcfg_ShowPlayerWindow</cstring>
122122 </property>
123123 <property name="text">
124 <string>Show player window</string>
124 <string>Show pla&amp;yer window</string>
125125 </property>
126126 <property name="toolTip" stdset="0">
127127 <string>Check to enable an extra player window.</string>
……
353353 <cstring>kcfg_UseScores</cstring>
354354 </property>
355355 <property name="text">
356 <string>Use &amp;scores</string>
356 <string>&amp;Use scores</string>
357357 </property>
358358 <property name="checked">
359359 <bool>false</bool>
……
367367 <cstring>kcfg_UseRatings</cstring>
368368 </property>
369369 <property name="text">
370 <string>Use ratings</string>
370 <string>Use rati&amp;ngs</string>
371371 </property>
372372 <property name="toolTip" stdset="0">
373373 <string>You can assign ratings to tracks manually, from 1 to 5 stars.</string>
374374 </property>
375375 </widget>
376 <widget class="Line">
377 <property name="name">
378 <cstring>line1</cstring>
379 </property>
380 <property name="frameShape">
381 <enum>HLine</enum>
382 </property>
383 <property name="frameShadow">
384 <enum>Sunken</enum>
385 </property>
386 <property name="orientation">
387 <enum>Horizontal</enum>
388 </property>
389 </widget>
390 <widget class="KActiveLabel">
391 <property name="name">
392 <cstring>moodbarHelpLabel</cstring>
393 </property>
394 <property name="text">
395 <string>You need the &lt;a href='http://amarok.kde.org/wiki/Moodbar'&gt;moodbar package&lt;/a&gt; installed to enable the moodbar feature.</string>
396 </property>
397 </widget>
398 <widget class="QFrame">
399 <property name="name">
400 <cstring>moodFrame</cstring>
401 </property>
402 <property name="frameShape">
403 <enum>NoFrame</enum>
404 </property>
405 <property name="frameShadow">
406 <enum>Raised</enum>
407 </property>
408 <property name="lineWidth">
409 <number>0</number>
410 </property>
411 <property name="margin">
412 <number>0</number>
413 </property>
414 <vbox>
415 <property name="name">
416 <cstring>unnamed</cstring>
417 </property>
418 <property name="margin">
419 <number>0</number>
420 </property>
421 <property name="spacing">
422 <number>0</number>
423 </property>
424 <widget class="QCheckBox">
425 <property name="name">
426 <cstring>kcfg_ShowMoodbar</cstring>
427 </property>
428 <property name="enabled">
429 <bool>true</bool>
430 </property>
431 <property name="text">
432 <string>Use &amp;moods</string>
433 </property>
434 <property name="checked">
435 <bool>true</bool>
436 </property>
437 <property name="toolTip" stdset="0">
438 <string>Displays a visual representation of the current track in the slider bar of the player window and a column in the playlist window.</string>
439 </property>
440 <property name="whatsThis" stdset="0">
441 <string>Displays a visual representation of the current track in the slider bar of the player window and a column in the playlist window.</string>
442 </property>
443 </widget>
444 <widget class="QLayoutWidget">
445 <property name="name">
446 <cstring>layout8_2_2</cstring>
447 </property>
448 <hbox>
449 <property name="name">
450 <cstring>unnamed</cstring>
451 </property>
452 <spacer>
453 <property name="name">
454 <cstring>spacerMoodier</cstring>
455 </property>
456 <property name="orientation">
457 <enum>Horizontal</enum>
458 </property>
459 <property name="sizeType">
460 <enum>Fixed</enum>
461 </property>
462 <property name="sizeHint">
463 <size>
464 <width>16</width>
465 <height>21</height>
466 </size>
467 </property>
468 </spacer>
469 <widget class="QCheckBox">
470 <property name="name">
471 <cstring>kcfg_MakeMoodier</cstring>
472 </property>
473 <property name="enabled">
474 <bool>true</bool>
475 </property>
476 <property name="text">
477 <string>Make m&amp;oodier:</string>
478 </property>
479 <property name="toolTip" stdset="0">
480 <string>When enabled, the hue distribution is quantised and respread evenly, giving a prettier but less meaningful output.</string>
481 </property>
482 <property name="whatsThis" stdset="0">
483 <string>When enabled, the hue distribution is quantised and respread evenly, giving a prettier but less meaningful output.</string>
484 </property>
485 </widget>
486 <widget class="QComboBox">
487 <item>
488 <property name="text">
489 <string>Happy Like a Rainbow</string>
490 </property>
491 </item>
492 <item>
493 <property name="text">
494 <string>Angry as Hell</string>
495 </property>
496 </item>
497 <item>
498 <property name="text">
499 <string>Frozen in the Arctic</string>
500 </property>
501 </item>
502 <property name="name">
503 <cstring>kcfg_AlterMood</cstring>
504 </property>
505 <property name="enabled">
506 <bool>false</bool>
507 </property>
508 </widget>
509 <spacer>
510 <property name="name">
511 <cstring>spacer7_2_2_2</cstring>
512 </property>
513 <property name="orientation">
514 <enum>Horizontal</enum>
515 </property>
516 <property name="sizeType">
517 <enum>Expanding</enum>
518 </property>
519 <property name="sizeHint">
520 <size>
521 <width>130</width>
522 <height>20</height>
523 </size>
524 </property>
525 </spacer>
526 </hbox>
527 </widget>
528 <widget class="QLayoutWidget">
529 <property name="name">
530 <cstring>layout7_2_2</cstring>
531 </property>
532 <hbox>
533 <property name="name">
534 <cstring>unnamed</cstring>
535 </property>
536 <spacer>
537 <property name="name">
538 <cstring>spacerWithMusic</cstring>
539 </property>
540 <property name="orientation">
541 <enum>Horizontal</enum>
542 </property>
543 <property name="sizeType">
544 <enum>Fixed</enum>
545 </property>
546 <property name="sizeHint">
547 <size>
548 <width>16</width>
549 <height>21</height>
550 </size>
551 </property>
552 </spacer>
553 <widget class="QCheckBox">
554 <property name="name">
555 <cstring>kcfg_MoodsWithMusic</cstring>
556 </property>
557 <property name="enabled">
558 <bool>true</bool>
559 </property>
560 <property name="text">
561 <string>Stor&amp;e mood data files with music</string>
562 </property>
563 <property name="toolTip" stdset="0">
564 <string>Enabling this option stores Mood data files with the music files. Disabling stores them in your home folder.</string>
565 </property>
566 <property name="whatsThis" stdset="0">
567 <string>Enabling this option stores Mood data files with the music files. Namely, the mood file for /music/file.mp3 will be /music/file.mood. Disabling stores them in your home folder.</string>
568 </property>
569 </widget>
570 </hbox>
571 </widget>
572 </vbox>
573 </widget>
574376 </vbox>
575377 </widget>
576378 <widget class="QGroupBox">
……
438438 </spacer>
439439 </vbox>
440440</widget>
441<customwidgets>
442</customwidgets>
441443<connections>
442444 <connection>
443445 <sender>kcfg_ShowTrayIcon</sender>
……
459459 <receiver>kLineEdit_customBrowser</receiver>
460460 <slot>setEnabled(bool)</slot>
461461 </connection>
462 <connection>
463 <sender>kcfg_ShowMoodbar</sender>
464 <signal>toggled(bool)</signal>
465 <receiver>General</receiver>
466 <slot>slotUpdateMoodFrame()</slot>
467 </connection>
468 <connection>
469 <sender>kcfg_MakeMoodier</sender>
470 <signal>toggled(bool)</signal>
471 <receiver>General</receiver>
472 <slot>slotUpdateMoodFrame()</slot>
473 </connection>
474462</connections>
475463<includes>
476464 <include location="local" impldecl="in implementation">Options1.ui.h</include>
……
473473<includehints>
474474 <includehint>kcombobox.h</includehint>
475475 <includehint>klineedit.h</includehint>
476 <includehint>kactivelabel.h</includehint>
477476</includehints>
478477</UI>
src/Options1.ui.h
(2 / 2)
  
4646
4747void Options1::slotUpdateMoodFrame()
4848{
49 if( Moodbar::executableExists() )
49/* if( Moodbar::executableExists() )
5050 {
5151 moodbarHelpLabel->hide();
5252 moodFrame->setEnabled(true);
……
6161 moodbarHelpLabel->show();
6262 kcfg_ShowMoodbar->setChecked(false);
6363 moodFrame->setEnabled(false);
64 }
64 } */
6565}
src/configdialog.cpp
(0 / 5)
  
288288 amaroK::setUseScores( m_opt1->kcfg_UseScores->isChecked() );
289289 amaroK::setUseRatings( m_opt1->kcfg_UseRatings->isChecked() );
290290
291 // The following makes everything with a moodbar redraw itself.
292 amaroK::setMoodbarPrefs( m_opt1->kcfg_ShowMoodbar->isChecked(),
293 m_opt1->kcfg_MakeMoodier->isChecked(),
294 m_opt1->kcfg_AlterMood->currentItem(),
295 m_opt1->kcfg_MoodsWithMusic->isChecked() );
296291}
297292
298293