Diffstat (limited to 'noncore/graphics/opie-eye/gui/imageview.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/opie-eye/gui/imageview.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp index be58c72..ebdfc60 100644 --- a/noncore/graphics/opie-eye/gui/imageview.cpp +++ b/noncore/graphics/opie-eye/gui/imageview.cpp | |||
@@ -17,92 +17,95 @@ ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name | |||
17 | { | 17 | { |
18 | m_viewManager = 0; | 18 | m_viewManager = 0; |
19 | focus_in_count = 0; | 19 | focus_in_count = 0; |
20 | m_cfg = cfg; | 20 | m_cfg = cfg; |
21 | m_isFullScreen = false; | 21 | m_isFullScreen = false; |
22 | m_ignore_next_in = false; | 22 | m_ignore_next_in = false; |
23 | m_slideTimer = 0; | 23 | m_slideTimer = 0; |
24 | QPEApplication::setStylusOperation(viewport(),QPEApplication::RightOnHold); | 24 | QPEApplication::setStylusOperation(viewport(),QPEApplication::RightOnHold); |
25 | initKeys(); | 25 | initKeys(); |
26 | m_slideValue = 5; | 26 | m_slideValue = 5; |
27 | m_gDisplayType = 0; | 27 | m_gDisplayType = 0; |
28 | m_gPrevNext = 0; | 28 | m_gPrevNext = 0; |
29 | m_hGroup = 0; | 29 | m_hGroup = 0; |
30 | } | 30 | } |
31 | 31 | ||
32 | void ImageView::setMenuActions(QActionGroup*hGroup,QActionGroup*nextprevGroup, QActionGroup*disptypeGroup) | 32 | void ImageView::setMenuActions(QActionGroup*hGroup,QActionGroup*nextprevGroup, QActionGroup*disptypeGroup) |
33 | { | 33 | { |
34 | m_gDisplayType = disptypeGroup; | 34 | m_gDisplayType = disptypeGroup; |
35 | m_gPrevNext = nextprevGroup; | 35 | m_gPrevNext = nextprevGroup; |
36 | m_hGroup = hGroup; | 36 | m_hGroup = hGroup; |
37 | } | 37 | } |
38 | 38 | ||
39 | ImageView::~ImageView() | 39 | ImageView::~ImageView() |
40 | { | 40 | { |
41 | odebug << "Destructor imageview" << oendl; | ||
41 | delete m_viewManager; | 42 | delete m_viewManager; |
42 | } | 43 | } |
43 | 44 | ||
44 | Opie::Core::OKeyConfigManager* ImageView::manager() | 45 | Opie::Core::OKeyConfigManager* ImageView::manager() |
45 | { | 46 | { |
46 | if (!m_viewManager) { | 47 | if (!m_viewManager) { |
47 | initKeys(); | 48 | initKeys(); |
48 | } | 49 | } |
49 | return m_viewManager; | 50 | return m_viewManager; |
50 | } | 51 | } |
51 | 52 | ||
52 | void ImageView::startSlide(int value) | 53 | void ImageView::startSlide(int value) |
53 | { | 54 | { |
54 | if (!m_slideTimer) { | 55 | if (!m_slideTimer) { |
55 | m_slideTimer = new QTimer(this); | 56 | m_slideTimer = new QTimer(this); |
56 | } | 57 | } |
57 | m_slideValue=value; | 58 | m_slideValue=value; |
58 | connect(m_slideTimer,SIGNAL(timeout()),SLOT(nextSlide())); | 59 | connect(m_slideTimer,SIGNAL(timeout()),SLOT(nextSlide())); |
59 | /* this "+1" is one millisecond. with that we can setup a slideshowvalue | 60 | /* this "+1" is one millisecond. with that we can setup a slideshowvalue |
60 | of 0. eg "as fast as possible". | 61 | of 0. eg "as fast as possible". |
61 | */ | 62 | */ |
62 | m_slideTimer->start(m_slideValue*1000+1,true); | 63 | m_slideTimer->start(m_slideValue*1000+1,true); |
63 | } | 64 | } |
64 | 65 | ||
65 | void ImageView::stopSlide() | 66 | void ImageView::stopSlide() |
66 | { | 67 | { |
67 | if (!m_slideTimer) { | 68 | if (!m_slideTimer) { |
68 | return; | 69 | return; |
69 | } | 70 | } |
70 | m_slideTimer->stop(); | 71 | m_slideTimer->stop(); |
71 | delete m_slideTimer; | 72 | delete m_slideTimer; |
72 | m_slideTimer = 0; | 73 | m_slideTimer = 0; |
73 | } | 74 | } |
74 | 75 | ||
75 | void ImageView::nextSlide() | 76 | void ImageView::nextSlide() |
76 | { | 77 | { |
77 | if (!m_slideTimer) { | 78 | if (!m_slideTimer) { |
78 | return; | 79 | return; |
79 | } | 80 | } |
81 | #if 0 | ||
80 | if (isHidden()) { | 82 | if (isHidden()) { |
81 | delete m_slideTimer; | 83 | delete m_slideTimer; |
82 | m_slideTimer = 0; | 84 | m_slideTimer = 0; |
83 | return; | 85 | return; |
84 | } | 86 | } |
87 | #endif | ||
85 | emit dispNext(); | 88 | emit dispNext(); |
86 | m_slideTimer->start(m_slideValue*1000,true); | 89 | m_slideTimer->start(m_slideValue*1000,true); |
87 | } | 90 | } |
88 | void ImageView::initKeys() | 91 | void ImageView::initKeys() |
89 | { | 92 | { |
90 | odebug << "init imageview keys" << oendl; | 93 | odebug << "init imageview keys" << oendl; |
91 | if (!m_cfg) { | 94 | if (!m_cfg) { |
92 | m_cfg = new Opie::Core::OConfig("opie-eye"); | 95 | m_cfg = new Opie::Core::OConfig("opie-eye"); |
93 | m_cfg->setGroup("image_view_keys" ); | 96 | m_cfg->setGroup("image_view_keys" ); |
94 | } | 97 | } |
95 | Opie::Core::OKeyPair::List lst; | 98 | Opie::Core::OKeyPair::List lst; |
96 | lst.append( Opie::Core::OKeyPair::upArrowKey() ); | 99 | lst.append( Opie::Core::OKeyPair::upArrowKey() ); |
97 | lst.append( Opie::Core::OKeyPair::downArrowKey() ); | 100 | lst.append( Opie::Core::OKeyPair::downArrowKey() ); |
98 | lst.append( Opie::Core::OKeyPair::leftArrowKey() ); | 101 | lst.append( Opie::Core::OKeyPair::leftArrowKey() ); |
99 | lst.append( Opie::Core::OKeyPair::rightArrowKey() ); | 102 | lst.append( Opie::Core::OKeyPair::rightArrowKey() ); |
100 | lst.append( Opie::Core::OKeyPair(Qt::Key_Escape,0)); | 103 | lst.append( Opie::Core::OKeyPair(Qt::Key_Escape,0)); |
101 | 104 | ||
102 | m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "image_view_keys", | 105 | m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "image_view_keys", |
103 | lst, false,this, "image_view_keys" ); | 106 | lst, false,this, "image_view_keys" ); |
104 | 107 | ||
105 | /** | 108 | /** |
106 | * Handle KeyEvents when they're pressed. This avoids problems | 109 | * Handle KeyEvents when they're pressed. This avoids problems |
107 | * with 'double next' on Return. | 110 | * with 'double next' on Return. |
108 | * The Return press would switch to this view and the return | 111 | * The Return press would switch to this view and the return |