Thread: [Jahshaka-cvs] SF.net SVN: editopia:[163] cinesuite/cineplay-cinecode/trunk/src
Status: Beta
Brought to you by:
jahshaka
From: <tim...@us...> - 2008-07-29 00:00:02
|
Revision: 163 http://editopia.svn.sourceforge.net/editopia/?rev=163&view=rev Author: timdewhirst Date: 2008-07-28 23:59:59 +0000 (Mon, 28 Jul 2008) Log Message: ----------- cinesuite - tidyup - hide cancel button of not required Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/ReleaseDlg.cpp cinesuite/cineplay-cinecode/trunk/src/ReleaseDlg.h Modified: cinesuite/cineplay-cinecode/trunk/src/ReleaseDlg.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/ReleaseDlg.cpp 2008-07-28 23:58:44 UTC (rev 162) +++ cinesuite/cineplay-cinecode/trunk/src/ReleaseDlg.cpp 2008-07-28 23:59:59 UTC (rev 163) @@ -66,16 +66,16 @@ { } - void message( const bool Upgrade, const QString Version ) + void message( const bool Upgrade, const QString& Version ) { redirect = Upgrade; - if ( !Upgrade ) { - QString str = "This version ("; - str.append( Version ); - str.append( ") is up to date." ); - dialog->message->setText( str ); + if ( !Upgrade ) + { + dialog->message->setText( tr( "This version (%1) is up to date" ).arg( Version ) ); + dialog->cancel->hide(); } - else { + else + { #ifdef BUILD_CINECODE dialog->message->setText( "An update for CineCode is available, do you wish to check out?" ); #else @@ -122,10 +122,9 @@ impl_( new ReleaseDlgImpl(ptr) ) { connect( impl_, SIGNAL( done( const bool, const bool ) ), this, SIGNAL( done( const bool, const bool ) ) ); -// show(); } -void ReleaseDlg::show( const bool Upgrade, const QString Version ) +void ReleaseDlg::show( const bool Upgrade, const QString& Version ) { impl_->message( Upgrade, Version ); impl_->skinDlg->show(); Modified: cinesuite/cineplay-cinecode/trunk/src/ReleaseDlg.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/ReleaseDlg.h 2008-07-28 23:58:44 UTC (rev 162) +++ cinesuite/cineplay-cinecode/trunk/src/ReleaseDlg.h 2008-07-28 23:59:59 UTC (rev 163) @@ -37,7 +37,7 @@ ReleaseDlg( QWidget* parent = NULL ); - void show( const bool Upgrade, const QString Version ); + void show( const bool Upgrade, const QString& Version ); void close(); signals: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-07-29 22:54:55
|
Revision: 166 http://editopia.svn.sourceforge.net/editopia/?rev=166&view=rev Author: timdewhirst Date: 2008-07-29 22:54:53 +0000 (Tue, 29 Jul 2008) Log Message: ----------- cinesuite - simplify favourite tray entry - increase text size slightly in favourite tray Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/FavoriteTrayEntry.cpp cinesuite/cineplay-cinecode/trunk/src/SetupDefs.h cinesuite/cineplay-cinecode/trunk/src/windows/favorite_tray_entry.ui Modified: cinesuite/cineplay-cinecode/trunk/src/FavoriteTrayEntry.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/FavoriteTrayEntry.cpp 2008-07-29 22:53:13 UTC (rev 165) +++ cinesuite/cineplay-cinecode/trunk/src/FavoriteTrayEntry.cpp 2008-07-29 22:54:53 UTC (rev 166) @@ -28,6 +28,7 @@ #include <qframe.h> #include <qimage.h> #include <qpixmap.h> +#include <qtooltip.h> FavoriteTrayEntry::FavoriteTrayEntry( QWidget* parent, int id, @@ -39,9 +40,10 @@ { if ( !thumb.isNull() && thumb.size() != QSize() ) image->setPixmap( QPixmap( thumb ) ); - location_label->setText( location ); name_label->setText( name ); connect( bottom_button, SIGNAL( clicked() ), this, SLOT( onRemoveClicked() ) ); + + QToolTip::add( this, location ); } void FavoriteTrayEntry::mouseDoubleClickEvent( QMouseEvent* ) Modified: cinesuite/cineplay-cinecode/trunk/src/SetupDefs.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/SetupDefs.h 2008-07-29 22:53:13 UTC (rev 165) +++ cinesuite/cineplay-cinecode/trunk/src/SetupDefs.h 2008-07-29 22:54:53 UTC (rev 166) @@ -53,7 +53,7 @@ #define SETTINGS_AUDIOBUFFER SETTINGS_ROOT"AudioBuffer" #define SETTINGS_TRAYSTATES SETTINGS_ROOT"TrayStates" #define SETTINGS_TRAYFONTPERCENT SETTINGS_ROOT"TrayFontPercent" -static const int SETTINGS_TRAYFONTPERCENT_DEFAULT = 75; +static const int SETTINGS_TRAYFONTPERCENT_DEFAULT = 80; #define SETTINGS_BRIGHTNESS SETTINGS_ROOT"Brightness" #define SETTINGS_CONTRAST SETTINGS_ROOT"Contrast" Modified: cinesuite/cineplay-cinecode/trunk/src/windows/favorite_tray_entry.ui =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/windows/favorite_tray_entry.ui 2008-07-29 22:53:13 UTC (rev 165) +++ cinesuite/cineplay-cinecode/trunk/src/windows/favorite_tray_entry.ui 2008-07-29 22:54:53 UTC (rev 166) @@ -8,7 +8,7 @@ <rect> <x>0</x> <y>0</y> - <width>204</width> + <width>203</width> <height>68</height> </rect> </property> @@ -35,7 +35,7 @@ <cstring>unnamed</cstring> </property> <property name="margin"> - <number>2</number> + <number>4</number> </property> <property name="spacing"> <number>0</number> @@ -82,14 +82,14 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> <property name="margin"> - <number>3</number> + <number>0</number> </property> <property name="spacing"> <number>0</number> @@ -108,31 +108,23 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLabel"> + <spacer> <property name="name"> - <cstring>name_label</cstring> + <cstring>spacer1</cstring> </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>7</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <property name="orientation"> + <enum>Horizontal</enum> </property> - <property name="maximumSize"> + <property name="sizeType"> + <enum>Expanding</enum> + </property> + <property name="sizeHint"> <size> - <width>32767</width> - <height>32767</height> + <width>71</width> + <height>10</height> </size> </property> - <property name="text"> - <string><qt><b>name</b></qt></string> - </property> - <property name="alignment"> - <set>AlignVCenter|AlignLeft</set> - </property> - </widget> + </spacer> <widget class="QLayoutWidget"> <property name="name"> <cstring>layout3</cstring> @@ -207,7 +199,7 @@ </widget> <widget class="QLabel"> <property name="name"> - <cstring>location_label</cstring> + <cstring>name_label</cstring> </property> <property name="sizePolicy"> <sizepolicy> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-07-29 23:00:28
|
Revision: 167 http://editopia.svn.sourceforge.net/editopia/?rev=167&view=rev Author: timdewhirst Date: 2008-07-29 23:00:24 +0000 (Tue, 29 Jul 2008) Log Message: ----------- cinesuite - change to deferred drawing of frames (better for high definition media) - allow combining of seek commands - use tryLock() rather than blocking on a lock being acquired - force an image update after a seek - start player thread with a slightly lower priority; should ensure UI remains responsive for as long as possible. Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/Command.cpp cinesuite/cineplay-cinecode/trunk/src/Command.h cinesuite/cineplay-cinecode/trunk/src/Common.cpp cinesuite/cineplay-cinecode/trunk/src/Player.cpp cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp Modified: cinesuite/cineplay-cinecode/trunk/src/Command.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Command.cpp 2008-07-29 22:54:53 UTC (rev 166) +++ cinesuite/cineplay-cinecode/trunk/src/Command.cpp 2008-07-29 23:00:24 UTC (rev 167) @@ -1,6 +1,24 @@ -#include "Command.h" +/* -*- mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */ +// This file is part of Cineplay +// +// Cineplay is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// Cineplay is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +// +// Copyright (C) 2008 Audiotube Ltd. +// For more information, see http://www.audiotube.com +#include "Command.h" namespace cineplay { @@ -12,11 +30,11 @@ void CommandQueue::postCommand(CommandPtr cmd) { - { - QMutexLocker lock(m_pMutex.get()); - m_deque.push_back( cmd ); - } - m_condition.wakeAll(); + { + QMutexLocker lock(m_pMutex.get()); + m_deque.push_back( cmd ); + } + m_condition.wakeAll(); } CommandPtr CommandQueue::deliverCommand() @@ -35,6 +53,7 @@ if( cmd->groupSimilar() && (cmd->id() == nextcmd->id()) ) { + nextcmd->combine( cmd ); cmd = nextcmd; m_deque.pop_front(); } Modified: cinesuite/cineplay-cinecode/trunk/src/Command.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Command.h 2008-07-29 22:54:53 UTC (rev 166) +++ cinesuite/cineplay-cinecode/trunk/src/Command.h 2008-07-29 23:00:24 UTC (rev 167) @@ -30,6 +30,8 @@ namespace cineplay { + class Command; + typedef boost::shared_ptr< Command > CommandPtr; class Command { @@ -39,12 +41,10 @@ virtual void execute() = 0; virtual int id() { return 0; } virtual bool groupSimilar() { return false; } + virtual void combine( CommandPtr ) {} }; - typedef boost::shared_ptr<class Command> CommandPtr; - - class CommandQueue { public: Modified: cinesuite/cineplay-cinecode/trunk/src/Common.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-07-29 22:54:53 UTC (rev 166) +++ cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-07-29 23:00:24 UTC (rev 167) @@ -685,6 +685,7 @@ QBuffer buffer( traystates ); buffer.open( IO_ReadWrite ); + if ( !m_trays.empty() ) { QDataStream ds( &buffer ); @@ -719,7 +720,7 @@ { QString trayname; ds >> trayname; - if ( m_trays.count( trayname ) ) + if ( !m_trays.empty() && m_trays.count( trayname ) ) { ds >> *m_trays[ trayname ]; m_trays[ trayname ]->update(); @@ -1019,6 +1020,10 @@ { DEBUG_LOG; + // skip on until we find a valid favourite + while ( !m_favList->isValid( index ) && index < m_favList->getEntryCount() ) + ++index; + m_currentFavourite = index; QString str = m_favList->getUrl(index); @@ -1069,7 +1074,7 @@ if(dlg.exec() == QDialog::Accepted) { - m_favList->BuildMenu(m_favMenu, this, SLOT( onFavSelected(int) ) ); + m_favList->BuildMenu( m_favMenu, this, SLOT( onFavSelected(int) ) ); updateFavMenu(); } } @@ -1442,7 +1447,7 @@ void Common::mouseMoveEvent( QMouseEvent* event ) { - static const int MINIMUM_GAP = 25; + static const int MINIMUM_GAP = 50; if(m_draggingApp) { @@ -1570,15 +1575,15 @@ //we must do this because the boost::smart_ptr's are not thread safe, and we end up with a massive // resource leak if we do not guard against this. we cant steal the object from the pointer either // so copy as little as possible for the video store to use: - - //lock scope + if ( m_frameCacheMutex.tryLock() ) { - QMutexLocker lock( &m_frameCacheMutex ); m_frameCache = ml::frame_type::shallow_copy(frame); if(frame->get_image()) m_frameCache->set_image( ml::image_type_ptr( frame->get_image()->clone() ) ); + m_frameCacheMutex.unlock(); } + m_frameCache = frame; QApplication::postEvent( this, new PlayerFrameUpdateEvent( player ) ); } @@ -1680,10 +1685,13 @@ { PlayerFrameUpdateEvent *le = dynamic_cast<PlayerFrameUpdateEvent*>(e); - if(le) + if( le ) { - QMutexLocker lock( &m_frameCacheMutex ); - m_jwStore->store( m_players->getPlayerIndex( le->player() ) )->push( m_frameCache ); + if ( m_frameCacheMutex.tryLock() ) + { + m_jwStore->store( m_players->getPlayerIndex( le->player() ) )->push( m_frameCache ); + m_frameCacheMutex.unlock(); + } } } break; Modified: cinesuite/cineplay-cinecode/trunk/src/Player.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Player.cpp 2008-07-29 22:54:53 UTC (rev 166) +++ cinesuite/cineplay-cinecode/trunk/src/Player.cpp 2008-07-29 23:00:24 UTC (rev 167) @@ -126,7 +126,20 @@ void execute(); bool groupSimilar() { return true; } int id() { return 1; } + void combine( CommandPtr old ) + { + SeekCommandPtr oldAsSeek( boost::dynamic_pointer_cast< SeekCommand >( old ) ); + if ( !oldAsSeek ) + return; + // ensure we keep bigger seeks + if ( oldAsSeek->m_frame > 1 ) + { + m_frame = oldAsSeek->m_frame; + m_flags = oldAsSeek->m_flags; + } + } + private: SeekCommand(Player* pPlayer, int frame, bool relative ) : PlayerCommand(pPlayer), @@ -468,10 +481,13 @@ void SeekCommand::execute() { - DEBUG_LOG; + DEBUG_LOG << m_frame << m_flags; if( m_pPlayer ) + { m_pPlayer->internalSeek( m_frame, m_flags ); + m_pPlayer->storeFrame(); + } } void RefreshVideoCommand::execute() @@ -512,7 +528,7 @@ , m_delay( audioStore->properties().get_property_with_string( "preroll" ).value< int >() ) { DEBUG_LOG; - start(); + start( QThread::LowPriority ); } Player::~Player() @@ -604,7 +620,7 @@ void Player::setVolume(float volume) { - DEBUG_LOG; + DEBUG_LOG_VV; QMutexLocker lock( &m_mutex ); m_volume = volume; @@ -691,7 +707,7 @@ void Player::storeFrame( bool pushAudio ) { - DEBUG_LOG << this; + DEBUG_LOG_VV << this; // don't flush() the audio frame on mute, as this will cause the playback speed // to runaway @@ -785,7 +801,7 @@ CommandPtr cmd = m_commandQueue.deliverCommand(); if(cmd) { - QMutexLocker lock( &m_mutex ); + // QMutexLocker lock( &m_mutex ); cmd->execute(); } } Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp 2008-07-29 22:54:53 UTC (rev 166) +++ cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp 2008-07-29 23:00:24 UTC (rev 167) @@ -123,7 +123,7 @@ // Repaint right now: this is how stores are expected to behave // this is safe only if done from the GUI thread - parent_->owner()->repaint(); + parent_->owner()->update(); return frame; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-07-29 23:01:50
|
Revision: 168 http://editopia.svn.sourceforge.net/editopia/?rev=168&view=rev Author: timdewhirst Date: 2008-07-29 23:01:48 +0000 (Tue, 29 Jul 2008) Log Message: ----------- cinesuite - add support for favourites being invalidated Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp cinesuite/cineplay-cinecode/trunk/src/CinePlay.cpp cinesuite/cineplay-cinecode/trunk/src/PlayList.cpp cinesuite/cineplay-cinecode/trunk/src/PlayList.h Modified: cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp 2008-07-29 23:00:24 UTC (rev 167) +++ cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp 2008-07-29 23:01:48 UTC (rev 168) @@ -484,6 +484,9 @@ CFavourites* favorites = m_impl->m_favList; for ( unsigned int i=0; i<favorites->getEntryCount(); ++i ) { + if ( !favorites->isValid( i ) ) + continue; + FavoriteTrayEntry* e = new FavoriteTrayEntry( m_favouriteTrayPlaceholder, i, favorites->getName( i ), Modified: cinesuite/cineplay-cinecode/trunk/src/CinePlay.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/CinePlay.cpp 2008-07-29 23:00:24 UTC (rev 167) +++ cinesuite/cineplay-cinecode/trunk/src/CinePlay.cpp 2008-07-29 23:01:48 UTC (rev 168) @@ -134,6 +134,9 @@ CFavourites* favorites = m_impl->m_favList; for ( unsigned int i=0; i<favorites->getEntryCount(); ++i ) { + if ( !favorites->isValid( i ) ) + continue; + QWidget* e = new FavoriteTrayEntry( m_trayPlaceholder, i, favorites->getName( i ), Modified: cinesuite/cineplay-cinecode/trunk/src/PlayList.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/PlayList.cpp 2008-07-29 23:00:24 UTC (rev 167) +++ cinesuite/cineplay-cinecode/trunk/src/PlayList.cpp 2008-07-29 23:01:48 UTC (rev 168) @@ -26,6 +26,7 @@ #include <qsettings.h> #include <qpopupmenu.h> +#include <qfile.h> namespace cineplay { @@ -124,7 +125,7 @@ return m_urls.first(); } - void CMruList::BuildMenu(QPopupMenu *menu, QObject *receiver, const char *slot) + void CMruList::BuildMenu( QPopupMenu *menu, QObject *receiver, const char *slot ) { DEBUG_LOG; @@ -215,34 +216,41 @@ emit changed(); } - QString CFavourites::getUrl(unsigned int index) + QString CFavourites::getUrl(unsigned int index) const { DEBUG_LOG; return m_data[index].url; } - int CFavourites::getFrameNumber(unsigned int index) + int CFavourites::getFrameNumber(unsigned int index) const { DEBUG_LOG; return m_data[index].frameNumber; } - QString CFavourites::getName(unsigned int index) + QString CFavourites::getName(unsigned int index) const { DEBUG_LOG; return m_data[index].name; } - QImage CFavourites::getThumbnail( unsigned int index ) + QImage CFavourites::getThumbnail( unsigned int index ) const { DEBUG_LOG; return m_data[index].thumbnail; } + bool CFavourites::isValid( unsigned int index ) const + { + DEBUG_LOG; + + return QFile::exists( getUrl( index ) ); + } + void CFavourites::removeEntry(unsigned int ref) { DEBUG_LOG; @@ -281,6 +289,8 @@ int ref = menu->insertItem( str, receiver, slot ); menu->setItemParameter ( ref, static_cast<int>(t) ); + menu->setItemVisible( ref, isValid( t ) ); + menu->setItemEnabled( ref, isValid( t ) ); } } Modified: cinesuite/cineplay-cinecode/trunk/src/PlayList.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/PlayList.h 2008-07-29 23:00:24 UTC (rev 167) +++ cinesuite/cineplay-cinecode/trunk/src/PlayList.h 2008-07-29 23:01:48 UTC (rev 168) @@ -75,10 +75,11 @@ void readSettings(); void writeSettings(); void pushUrl( const QString &url, const QString &name, const QImage& thumbnail, int index = -1 ); - QString getUrl( unsigned int index ); - int getFrameNumber( unsigned int index ); - QString getName( unsigned int index ); - QImage getThumbnail( unsigned int index ); + QString getUrl( unsigned int index ) const; + int getFrameNumber( unsigned int index ) const; + QString getName( unsigned int index ) const; + QImage getThumbnail( unsigned int index ) const; + bool isValid( unsigned int index ) const; unsigned int getEntryCount() { return static_cast<unsigned int>( m_data.size() ); } void removeEntry(unsigned int ref); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-07-29 23:04:15
|
Revision: 170 http://editopia.svn.sourceforge.net/editopia/?rev=170&view=rev Author: timdewhirst Date: 2008-07-29 23:04:13 +0000 (Tue, 29 Jul 2008) Log Message: ----------- CineCode - change to const ref. Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/FilterGraph.cpp cinesuite/cineplay-cinecode/trunk/src/FilterGraph.h Modified: cinesuite/cineplay-cinecode/trunk/src/FilterGraph.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/FilterGraph.cpp 2008-07-29 23:02:50 UTC (rev 169) +++ cinesuite/cineplay-cinecode/trunk/src/FilterGraph.cpp 2008-07-29 23:04:13 UTC (rev 170) @@ -233,7 +233,7 @@ } -bool FilterGraph::ShouldSet(const std::wstring name, bool overwrite) +bool FilterGraph::ShouldSet(const std::wstring& name, bool overwrite) { DEBUG_LOG << opl::to_string( name ) << overwrite; @@ -242,15 +242,18 @@ } -bool FilterGraph::HaveVar(const std::wstring name) +bool FilterGraph::HaveVar(const std::wstring& name) { DEBUG_LOG << opl::to_string( name ); + if ( m_vars.empty() ) + return false; + std::map<std::wstring, std::wstring>::iterator it = m_vars.find(name); return it != m_vars.end(); } -std::wstring FilterGraph::Var(const std::wstring &str) +std::wstring FilterGraph::Var(const std::wstring& str) { DEBUG_LOG << opl::to_string( str ); Modified: cinesuite/cineplay-cinecode/trunk/src/FilterGraph.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/FilterGraph.h 2008-07-29 23:02:50 UTC (rev 169) +++ cinesuite/cineplay-cinecode/trunk/src/FilterGraph.h 2008-07-29 23:04:13 UTC (rev 170) @@ -135,21 +135,21 @@ std::wstring m_defaultInput; std::wstring m_defaultStore; - bool ShouldSet(const std::wstring name, bool overwrite); + bool ShouldSet(const std::wstring& name, bool overwrite); public: FilterGraph(); ~FilterGraph(); - template <typename T> void SetVar(const std::wstring name, T value, bool overwrite = false); + template <typename T> void SetVar(const std::wstring& name, T value, bool overwrite = false); - bool HaveVar(const std::wstring name); - std::wstring Var(const std::wstring &str); + bool HaveVar(const std::wstring& name); + std::wstring Var(const std::wstring& str); - void SetDefaultInput(const std::wstring &name); - void SetDefaultStore(const std::wstring &name); - FilterGraphNode* PushFilter(const std::wstring &name, const std::wstring &type); + void SetDefaultInput(const std::wstring& name); + void SetDefaultStore(const std::wstring& name); + FilterGraphNode* PushFilter(const std::wstring &name, const std::wstring& type); FilterGraphNode* SearchFilter(const std::wstring &name, bool thrw = true); FilterGraphInput* PushInput(const std::wstring &name, const std::wstring &type); FilterGraphInput* SearchInput(const std::wstring &name, bool noFilter = false, bool thrw = true); @@ -170,7 +170,7 @@ template <typename T> -void FilterGraph::SetVar(const std::wstring name, T value, bool overwrite) +void FilterGraph::SetVar(const std::wstring& name, T value, bool overwrite) { if( ShouldSet(name, overwrite) ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-07-29 23:22:39
|
Revision: 171 http://editopia.svn.sourceforge.net/editopia/?rev=171&view=rev Author: timdewhirst Date: 2008-07-29 23:22:37 +0000 (Tue, 29 Jul 2008) Log Message: ----------- cinesuite - add in version command line option & build id Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/Common.cpp cinesuite/cineplay-cinecode/trunk/src/config.pri Modified: cinesuite/cineplay-cinecode/trunk/src/Common.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-07-29 23:04:13 UTC (rev 170) +++ cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-07-29 23:22:37 UTC (rev 171) @@ -280,6 +280,14 @@ QStringList::iterator I = args->begin(); while ( I != args->end() ) { + if ( *I == "-version" || *I == "-v" ) + { + QString version = tr( "build id: %1" ).arg( BUILD_ID ); + QMessageBox::information( NULL, + tr( "version" ), + version ); + return false; + } if ( *I == "-debug" ) { log_stream.open( "log" ); Modified: cinesuite/cineplay-cinecode/trunk/src/config.pri =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/config.pri 2008-07-29 23:04:13 UTC (rev 170) +++ cinesuite/cineplay-cinecode/trunk/src/config.pri 2008-07-29 23:22:37 UTC (rev 171) @@ -1,9 +1,19 @@ CONFIG += thread qt warn_on opengl CONFIG += release -CONFIG += console +#CONFIG += console win32 { + BUILD_ID = "$$system( c:\cygwin\bin\date.exe +%A-%H:%M-%d%m%Y )" +} +!win32 { + BUILD_ID = "$$system( date +%A-%H:%M-%d%m%Y )" +} + +message( BUILD_ID is set to: $$BUILD_ID ) +DEFINES += BUILD_ID=\"$$BUILD_ID\" + +win32 { QMAKE_CXXFLAGS_RELEASE += /Zi /Od QMAKE_LFLAGS_RELEASE += /INCREMENTAL:NO /DEBUG /OPT:REF /OPT:ICF /MAP /DELAYLOAD:shell32.dll } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-08-08 08:03:12
|
Revision: 172 http://editopia.svn.sourceforge.net/editopia/?rev=172&view=rev Author: timdewhirst Date: 2008-08-08 08:03:08 +0000 (Fri, 08 Aug 2008) Log Message: ----------- cinesuite - add of geometry and lerp classes Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/common.pri Added Paths: ----------- cinesuite/cineplay-cinecode/trunk/src/Geometry.hpp cinesuite/cineplay-cinecode/trunk/src/Lerp.hpp Added: cinesuite/cineplay-cinecode/trunk/src/Geometry.hpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Geometry.hpp (rev 0) +++ cinesuite/cineplay-cinecode/trunk/src/Geometry.hpp 2008-08-08 08:03:08 UTC (rev 172) @@ -0,0 +1,76 @@ +/* -*- mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */ + +// This file is part of Cineplay +// +// Cineplay is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// Cineplay is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +// +// Copyright (C) 2008 Audiotube Ltd. +// For more information, see http://www.audiotube.com + +#pragma once + +// std +#include <list> +#include <iostream> + +/// Basic 3D point class +struct point3 +{ + point3() + : x( 0 ), y( 0 ), z( 0 ) + {} + + point3( double x_, double y_, double z_ ) + : x( x_ ), y( y_ ), z( z_ ) + {} + + point3( const point3& rhs ) + : x( rhs.x ), y( rhs.y ), z( rhs.z ) + {} + + const point3& operator=( const point3& rhs ) + { + x = rhs.x; y = rhs.y; z = rhs.z; + return *this; + } + + double x, y, z; +}; + +static std::ostream& operator<<( std::ostream& os, const point3& p ) +{ + os << "(" << p.x << ", " << p.y << ", " << p.z << ")"; + return os; +} + +/// An ordered set of points in 3D space. The convention +/// is that these follow a right handed system with normal +/// towards the observer starting in quadrant 1 i.e. for a +/// square (0, 0), (1, 0), (1, 1), (0, 1) we would have: +/// - a == (1, 1) +/// - b == (0, 1) +/// - c == (0, 0) +/// - d == (1, 0) +struct quad3 +{ + point3 a, b, c, d; +}; + +static std::ostream& operator<<( std::ostream& os, const quad3& q ) +{ + os << "[" << q.a << ", " << q.b << ", " << q.c << ", " << q.d << "]"; + return os; +} + +typedef std::list< quad3 > quad3_list; Added: cinesuite/cineplay-cinecode/trunk/src/Lerp.hpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Lerp.hpp (rev 0) +++ cinesuite/cineplay-cinecode/trunk/src/Lerp.hpp 2008-08-08 08:03:08 UTC (rev 172) @@ -0,0 +1,52 @@ +/* -*- mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */ + +// This file is part of Cineplay +// +// Cineplay is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// Cineplay is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +// +// Copyright (C) 2008 Audiotube Ltd. +// For more information, see http://www.audiotube.com + +#pragma once + +#include "Geometry.hpp" + +// return a value linearly interpolated between start, end +// according to value \a p [0:1] +template < class T > +T Lerp( const T& start, const T& end, double p ) +{ + T diff = end - start; + return start + p*diff; +} + +template <> +point3 Lerp( const point3& start, const point3& end, double p ) +{ + return point3( Lerp( start.x, end.x, p ), + Lerp( start.y, end.y, p ), + Lerp( start.z, end.z, p ) ); +} + +template <> +quad3 Lerp( const quad3& start, const quad3& end, double p ) +{ + quad3 result; + result.a = Lerp( start.a, end.a, p ); + result.b = Lerp( start.b, end.b, p ); + result.c = Lerp( start.c, end.c, p ); + result.d = Lerp( start.d, end.d, p ); + + return result; +} Modified: cinesuite/cineplay-cinecode/trunk/src/common.pri =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/common.pri 2008-07-29 23:22:37 UTC (rev 171) +++ cinesuite/cineplay-cinecode/trunk/src/common.pri 2008-08-08 08:03:08 UTC (rev 172) @@ -50,7 +50,9 @@ PlayerMultiplexer.hpp \ LogMessageHandler.h \ ScrollViewResizer.h \ - GridLayoutCallback.h + GridLayoutCallback.h \ + Geometry.hpp \ + Lerp.hpp SOURCES += \ AddFavouriteDlg.cpp \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-08-08 08:05:54
|
Revision: 174 http://editopia.svn.sourceforge.net/editopia/?rev=174&view=rev Author: timdewhirst Date: 2008-08-08 08:05:49 +0000 (Fri, 08 Aug 2008) Log Message: ----------- cinesuite - add transitioning to GridLayoutCallback - scrap invalidation scheme; always poll for layout Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/GridLayoutCallback.cpp cinesuite/cineplay-cinecode/trunk/src/GridLayoutCallback.h cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.hpp cinesuite/cineplay-cinecode/trunk/src/widgets/sdl_store.hpp cinesuite/cineplay-cinecode/trunk/src/widgets/widget_store.hpp Modified: cinesuite/cineplay-cinecode/trunk/src/GridLayoutCallback.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/GridLayoutCallback.cpp 2008-08-08 08:04:11 UTC (rev 173) +++ cinesuite/cineplay-cinecode/trunk/src/GridLayoutCallback.cpp 2008-08-08 08:05:49 UTC (rev 174) @@ -20,9 +20,20 @@ #include "GridLayoutCallback.h" +// local +#include "Lerp.hpp" +#include "log.h" + +// std +#include <iterator> + // layout/callback implementation grid_layout_callback::grid_layout_callback( jw::widget_store* ws ) : widget_store_callback( ws ), + state_( NORMAL ), + total_steps_( 15 ), + current_step_( 0 ), + selected_( 0 ), margin_( 0.02 ), spacing_( 0.02 ) {} @@ -34,31 +45,65 @@ // select and transition qDebug( "grid_layout_callback: selected %i", i ); + selected_ = i; + if ( state_ == ENLARGED ) + state_ = REDUCING; + if ( state_ == NORMAL ) + state_ = ENLARGING; + emit selectedChanged( i ); } -jw::quad3 grid_layout_callback::layout( int id ) +quad3 grid_layout_callback::layout( int id ) { - const unsigned int total = ws_->number_stores(); - - static const unsigned int MAX_COLS = 3; - const unsigned int cols = ((total < MAX_COLS) ? total : MAX_COLS); - unsigned int rows = total / cols; - rows += ((total % cols) ? 1 : 0); - - unsigned int col_offset = id % cols; - unsigned int row_offset = id / cols; - - double width = (1 - 2*margin_ - (cols-1)*spacing_)/cols; - double height = (1 - 2*margin_ - (rows-1)*spacing_)/rows; - - jw::quad3 result; - result.b = jw::point3( margin_ + col_offset*( width + spacing_ ), margin_ + row_offset*( height + spacing_ ), 0 ); - result.c = jw::point3( result.b.x, result.b.y + height, 0 ); - result.d = jw::point3( result.c.x + width, result.c.y, 0 ); - result.a = jw::point3( result.d.x, result.d.y - height, 0 ); - - return result; + if ( id >= ws_->number_stores() ) + return quad3(); + + initializeQuads( ws_->number_stores() ); + quad3_list::const_iterator I = quads_.begin(); + std::advance( I, id ); + + if ( state_ == NORMAL ) + return *I; + + /// - a == (1, 1) + /// - b == (0, 1) + /// - c == (0, 0) + /// - d == (1, 0) + static const quad3 full = { point3( 1, 1, -0.1 ), point3( 0, 1, -0.1 ), point3( 0, 0, -0.1 ), point3( 1, 0, -0.1 ) }; + static const quad3 zero = { point3( 0, 0, 0.1 ), point3( 0, 0, 0.1 ), point3( 0, 0, 0.1 ), point3( 0, 0, 0.1 ) }; + + switch( state_ ) + { + case ENLARGING: + ++current_step_; + if ( current_step_ == total_steps_ ) + state_ = ENLARGED; + break; + + case REDUCING: + --current_step_; + if ( current_step_ == 0 ) + state_ = NORMAL; + break; + + default: + break; + } + + if ( id == selected_ ) + { + switch( state_ ) + { + case ENLARGED: return full; + case ENLARGING: return Lerp( *I, full, static_cast< double >( current_step_ )/total_steps_ ); + case REDUCING: return Lerp( *I, full, static_cast< double >( current_step_ )/total_steps_ ); + default: + break; + } + } + + return zero; } int grid_layout_callback::get_features() const @@ -66,6 +111,34 @@ return LAYOUT | SELECTION; } -void grid_layout_callback::on_timeout() -{} +void grid_layout_callback::initializeQuads( unsigned int total ) +{ + if ( total == quads_.size() ) + return; + DEBUG_LOG << total; + + static const unsigned int MAX_COLS = 3; + const unsigned int cols = ((total < MAX_COLS) ? total : MAX_COLS); + unsigned int rows = total / cols; + rows += ((total % cols) ? 1 : 0); + + quads_.clear(); + + for ( unsigned int id=0; id<total; ++id ) + { + unsigned int col_offset = id % cols; + unsigned int row_offset = id / cols; + + double width = (1 - 2*margin_ - (cols-1)*spacing_)/cols; + double height = (1 - 2*margin_ - (rows-1)*spacing_)/rows; + + quad3 result; + result.b = point3( margin_ + col_offset*( width + spacing_ ), margin_ + row_offset*( height + spacing_ ), 0 ); + result.c = point3( result.b.x, result.b.y + height, 0 ); + result.d = point3( result.c.x + width, result.c.y, 0 ); + result.a = point3( result.d.x, result.d.y - height, 0 ); + + quads_.push_back( result ); + } +} Modified: cinesuite/cineplay-cinecode/trunk/src/GridLayoutCallback.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/GridLayoutCallback.h 2008-08-08 08:04:11 UTC (rev 173) +++ cinesuite/cineplay-cinecode/trunk/src/GridLayoutCallback.h 2008-08-08 08:05:49 UTC (rev 174) @@ -22,11 +22,14 @@ // qt #include <qobject.h> -#include <qtimer.h> // local #include "Jah.h" +#include "Geometry.hpp" +// std +#include <list> + // layout/callback implementation class grid_layout_callback : public QObject, public jw::widget_store_callback @@ -37,18 +40,30 @@ grid_layout_callback( jw::widget_store* ws ); virtual void selected( int i ); - virtual jw::quad3 layout( int id ); + virtual quad3 layout( int id ); virtual int get_features() const; signals: void selectedChanged( int i ); -private slots: - void on_timeout(); +private: + void initializeQuads( unsigned int i ); -private: - QTimer timer_; + enum State { + NORMAL, + ENLARGED, + ENLARGING, + REDUCING + }; + + State state_; + const int total_steps_; + int current_step_; + int selected_; + const double margin_; const double spacing_; + + quad3_list quads_; }; Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp 2008-08-08 08:04:11 UTC (rev 173) +++ cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp 2008-08-08 08:05:49 UTC (rev 174) @@ -62,7 +62,6 @@ ml::store_type_ptr store( int i ) const; void set_store_count( int count ) const; unsigned int number_stores() const; - void invalidate_layout() const; void paintFrame( internal_store_ptr store ); @@ -87,10 +86,6 @@ mutable internal_store_container stores_; int selected_internal_store_; - mutable bool invalidate_layout_; - typedef std::set< internal_store_ptr > internal_store_set; - internal_store_set internal_stores_laidout_; - shader_state shaders_[ SHADER_COUNT ]; bool channels_used_; bool channel_matrix_dirty_; @@ -231,7 +226,6 @@ const widget_store_callback_ptr_list& callbacks ) : owner_(owner), selected_internal_store_( 0 ), - invalidate_layout_( false ), channels_used_(false), channel_matrix_dirty_(false), env_GL_2_0_targets_(false), @@ -471,18 +465,13 @@ if ( !layout ) { - qWarning( "opengl_store_impl::invalidate_layout: failed to find a callback that supports layout" ); + qWarning( "opengl_store_impl::find_layout_callback: failed to find a callback that supports layout" ); return widget_store_callback_ptr(); } return layout; } -void opengl_store_impl::invalidate_layout() const -{ - invalidate_layout_ = true; -} - void opengl_store_impl::paintFrame( internal_store_ptr store ) { if ( !store ) @@ -517,7 +506,7 @@ store->image_ = image; } - if ( invalidate_layout_ ) + if ( find_layout_callback() ) { quad3 q = find_layout_callback()->layout( store->id_ ); const double w = q.a.x - q.b.x; @@ -527,14 +516,6 @@ store->media_->y() = q.b.y + (h - ar_h)/2; store->media_->w() = w; store->media_->h() = ar_h; - - internal_stores_laidout_.insert( store ); - internal_store_set s( stores_.begin(), stores_.end() ); - if ( s == internal_stores_laidout_ ) - { - invalidate_layout_ = false; - internal_stores_laidout_ = internal_store_set(); - } } if ( channel_matrix_dirty_ ) @@ -989,11 +970,6 @@ return impl_->number_stores(); } -void opengl_store::invalidate_layout() const -{ - impl_->invalidate_layout(); -} - bool opengl_store::supported() const { opengl_store* nonConst = const_cast< opengl_store* >( this ); Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.hpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.hpp 2008-08-08 08:04:11 UTC (rev 173) +++ cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.hpp 2008-08-08 08:05:49 UTC (rev 174) @@ -50,7 +50,6 @@ virtual void set_store_count( int ) const; virtual unsigned int maximum_stores() const { return 16; } virtual unsigned int number_stores() const; - virtual void invalidate_layout() const; virtual bool supported() const; virtual QSize minimumSizeHint() const; Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/sdl_store.hpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/widgets/sdl_store.hpp 2008-08-08 08:04:11 UTC (rev 173) +++ cinesuite/cineplay-cinecode/trunk/src/widgets/sdl_store.hpp 2008-08-08 08:05:49 UTC (rev 174) @@ -41,7 +41,6 @@ virtual void set_store_count( int ) const {} virtual unsigned int maximum_stores() const { return 1; } virtual unsigned int number_stores() const { return 1; } - virtual void invalidate_layout() const {} virtual bool supported() const { return true; } virtual QSize minimumSizeHint() const; Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/widget_store.hpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/widgets/widget_store.hpp 2008-08-08 08:04:11 UTC (rev 173) +++ cinesuite/cineplay-cinecode/trunk/src/widgets/widget_store.hpp 2008-08-08 08:05:49 UTC (rev 174) @@ -9,6 +9,7 @@ #define JW_WIDGET_STORE_H #include "config.h" +#include "Geometry.hpp" // oml #include <openmedialib/ml/store.hpp> @@ -26,44 +27,6 @@ class widget_store; -/// Basic 3D point class to allow our callback to specify -/// locations of stores -struct WIDGETS_DECLSPEC point3 -{ - point3() - : x( 0 ), y( 0 ), z( 0 ) - {} - - point3( double x_, double y_, double z_ ) - : x( x_ ), y( y_ ), z( z_ ) - {} - - point3( const point3& rhs ) - : x( rhs.x ), y( rhs.y ), z( rhs.z ) - {} - - const point3& operator=( const point3& rhs ) - { - x = rhs.x; y = rhs.y; z = rhs.z; - return *this; - } - - double x, y, z; -}; - -/// An ordered set of points in 3D space. The convention -/// is that these follow a right handed system with normal -/// towards the observer starting in quadrant 1 i.e. for a -/// square (0, 0), (1, 0), (1, 1), (0, 1) we would have: -/// - a == (1, 1) -/// - b == (0, 1) -/// - c == (0, 0) -/// - d == (1, 0) -struct WIDGETS_DECLSPEC quad3 -{ - point3 a, b, c, d; -}; - /// Interface for classes that wish to be notified of events within /// a widget_store. /// For layout, the available space is assumed to be (0:1) @@ -106,7 +69,6 @@ virtual void set_store_count( int ) const = 0; virtual unsigned int maximum_stores() const = 0; virtual unsigned int number_stores() const = 0; - virtual void invalidate_layout() const = 0; virtual bool supported() const = 0; void register_callback( widget_store_callback_ptr cb ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-08-08 08:40:40
|
Revision: 177 http://editopia.svn.sourceforge.net/editopia/?rev=177&view=rev Author: timdewhirst Date: 2008-08-08 08:40:38 +0000 (Fri, 08 Aug 2008) Log Message: ----------- cinesuite - add extra guards around QSettings Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp cinesuite/cineplay-cinecode/trunk/src/Common.cpp Modified: cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp 2008-08-08 08:39:20 UTC (rev 176) +++ cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp 2008-08-08 08:40:38 UTC (rev 177) @@ -200,13 +200,15 @@ connect( m_effects->colour_correction, SIGNAL( toggled( bool ) ), this, SLOT( onFiltersEnabled( bool ) ) ); // intialise - QSettings settings; - m_effects->brightness->setValue( settings.readNumEntry( SETTINGS_BRIGHTNESS, 50 ) ); - m_effects->hue->setValue( settings.readNumEntry( SETTINGS_HUE, 50 ) ); - m_effects->contrast->setValue( settings.readNumEntry( SETTINGS_CONTRAST, 50 ) ); - m_effects->saturation->setValue( settings.readNumEntry( SETTINGS_SATURATION, 50 ) ); - m_effects->colour_correction->setChecked( settings.readBoolEntry( SETTINGS_COLOURFILTERENABLED, false ) ); - + { + QSettings settings; + m_effects->brightness->setValue( settings.readNumEntry( SETTINGS_BRIGHTNESS, 50 ) ); + m_effects->hue->setValue( settings.readNumEntry( SETTINGS_HUE, 50 ) ); + m_effects->contrast->setValue( settings.readNumEntry( SETTINGS_CONTRAST, 50 ) ); + m_effects->saturation->setValue( settings.readNumEntry( SETTINGS_SATURATION, 50 ) ); + m_effects->colour_correction->setChecked( settings.readBoolEntry( SETTINGS_COLOURFILTERENABLED, false ) ); + } + // disable the encode buttons CineUtils::FindWidget( "encode", m_effectsTray )->hide(); CineUtils::FindWidget( "favorites", m_effectsTray )->hide(); Modified: cinesuite/cineplay-cinecode/trunk/src/Common.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-08-08 08:39:20 UTC (rev 176) +++ cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-08-08 08:40:38 UTC (rev 177) @@ -318,12 +318,9 @@ // the size message and does it all later on. LoadDefaultInput(); - //local registry settings - QSettings settings; - m_volumeSlider = CineUtils::FindWidget( WIDGET_VOLUMESLIDER, m_parent ); - if(m_volumeSlider) + if( m_volumeSlider ) { //HACK! jahwidgets slider on the mac is not working for now. #ifdef Q_OS_MACX @@ -333,21 +330,29 @@ int volume_max = m_volumeSlider->property( "maxValue" ).toInt(); - int vol = settings.readNumEntry(SETTINGS_VOLUME, volume_max); + int vol = 0; + { + QSettings settings; + vol = settings.readNumEntry(SETTINGS_VOLUME, volume_max); + } + m_volumeSlider->setProperty( "value", vol ); volumeSliderMoved(vol); } //do not check for updates in case flag is set to value 0 - m_checkRelease = settings.readNumEntry( SETTINGS_CHECKUPDATE, 1 ); - if (m_checkRelease) - onCheckVersion(); - - //lastly before we show, load the last window pos - int xPos = settings.readNumEntry( SETTINGS_WINDOWXPOS, 200 ); - int yPos = settings.readNumEntry( SETTINGS_WINDOWYPOS, 200 ); - m_parent->move (xPos, yPos ); - m_parent->show(); + { + QSettings settings; + m_checkRelease = settings.readNumEntry( SETTINGS_CHECKUPDATE, 1 ); + if (m_checkRelease) + onCheckVersion(); + + //lastly before we show, load the last window pos + int xPos = settings.readNumEntry( SETTINGS_WINDOWXPOS, 200 ); + int yPos = settings.readNumEntry( SETTINGS_WINDOWYPOS, 200 ); + m_parent->move (xPos, yPos ); + m_parent->show(); + } return true; } @@ -458,9 +463,13 @@ } { - QSettings settings; - int audioPreRoll = settings.readNumEntry( SETTINGS_AUDIOPREROLL, 8 ); - int audioBuffer = settings.readNumEntry( SETTINGS_AUDIOBUFFER, 1024 ); + int audioPreRoll = 0; + int audioBuffer = 0; + { + QSettings settings; + audioPreRoll = settings.readNumEntry( SETTINGS_AUDIOPREROLL, 8 ); + audioBuffer = settings.readNumEntry( SETTINGS_AUDIOBUFFER, 1024 ); + } while( !m_audioStore ) { @@ -720,8 +729,10 @@ buffer.close(); - QSettings settings; - settings.writeEntry( SETTINGS_TRAYSTATES, CineUtils::QByteArrayToString( traystates ) ); + { + QSettings settings; + settings.writeEntry( SETTINGS_TRAYSTATES, CineUtils::QByteArrayToString( traystates ) ); + } } void Common::restoreTrayStates() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-08-09 08:55:05
|
Revision: 178 http://editopia.svn.sourceforge.net/editopia/?rev=178&view=rev Author: timdewhirst Date: 2008-08-09 08:55:02 +0000 (Sat, 09 Aug 2008) Log Message: ----------- cinesuite - modify geometry classes to support vector3 - add move method to callbacks - modify GridLayoutCallback to fix drag Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/Geometry.hpp cinesuite/cineplay-cinecode/trunk/src/GridLayoutCallback.cpp cinesuite/cineplay-cinecode/trunk/src/GridLayoutCallback.h cinesuite/cineplay-cinecode/trunk/src/common.pri cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp cinesuite/cineplay-cinecode/trunk/src/widgets/widget_store.hpp Added Paths: ----------- cinesuite/cineplay-cinecode/trunk/src/Geometry.cpp Added: cinesuite/cineplay-cinecode/trunk/src/Geometry.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Geometry.cpp (rev 0) +++ cinesuite/cineplay-cinecode/trunk/src/Geometry.cpp 2008-08-09 08:55:02 UTC (rev 178) @@ -0,0 +1,100 @@ + +/* -*- mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */ + +// This file is part of Cineplay +// +// Cineplay is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// Cineplay is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +// +// Copyright (C) 2008 Audiotube Ltd. +// For more information, see http://www.audiotube.com + +#include "Geometry.hpp" + +point3::point3() + : x( 0 ), y( 0 ), z( 0 ) +{} + +point3::point3( double x_, double y_, double z_ ) + : x( x_ ), y( y_ ), z( z_ ) +{} + +point3::point3( const point3& rhs ) + : x( rhs.x ), y( rhs.y ), z( rhs.z ) +{} + +point3& point3::operator=( const point3& rhs ) +{ + x = rhs.x; y = rhs.y; z = rhs.z; + return *this; +} + +point3& point3::operator+=( const vector3& v ) +{ + x += v.x; + y += v.y; + z += v.z; + + return *this; +} + +point3 operator+( const point3& p, const vector3& v ) +{ + point3 result( p ); + result+=v; + + return result; +} + +static std::ostream& operator<<( std::ostream& os, const point3& p ) +{ + os << "(" << p.x << ", " << p.y << ", " << p.z << ")"; + return os; +} + +vector3::vector3() + : x( 0 ), y( 0 ), z( 0 ) +{} + +vector3::vector3( double x_, double y_, double z_ ) + : x( x_ ), y( y_ ), z( z_ ) +{} + +vector3::vector3( const vector3& rhs ) + : x( rhs.x ), y( rhs.y ), z( rhs.z ) +{} + +vector3& vector3::operator=( const vector3& rhs ) +{ + x = rhs.x; y = rhs.y; z = rhs.z; + return *this; +} + +static std::ostream& operator<<( std::ostream& os, const vector3& p ) +{ + os << "(" << p.x << ", " << p.y << ", " << p.z << ")"; + return os; +} + +quad3& quad3::operator=( const quad3& rhs ) +{ + a = rhs.a; b = rhs.b; c = rhs.c; d = rhs.d; + + return *this; +} + +static std::ostream& operator<<( std::ostream& os, const quad3& q ) +{ + os << "[" << q.a << ", " << q.b << ", " << q.c << ", " << q.d << "]"; + return os; +} Modified: cinesuite/cineplay-cinecode/trunk/src/Geometry.hpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Geometry.hpp 2008-08-08 08:40:38 UTC (rev 177) +++ cinesuite/cineplay-cinecode/trunk/src/Geometry.hpp 2008-08-09 08:55:02 UTC (rev 178) @@ -24,36 +24,39 @@ #include <list> #include <iostream> +struct vector3; + /// Basic 3D point class struct point3 { - point3() - : x( 0 ), y( 0 ), z( 0 ) - {} + point3(); + point3( double x_, double y_, double z_ ); + point3( const point3& rhs ); + + point3& operator=( const point3& ); + point3& operator+=( const vector3& ); + + double x, y, z; +}; - point3( double x_, double y_, double z_ ) - : x( x_ ), y( y_ ), z( z_ ) - {} +static std::ostream& operator<<( std::ostream& os, const point3& p ); - point3( const point3& rhs ) - : x( rhs.x ), y( rhs.y ), z( rhs.z ) - {} +/// Basic 3D vector class +struct vector3 +{ + vector3(); + vector3( double x_, double y_, double z_ ); + vector3( const vector3& rhs ); - const point3& operator=( const point3& rhs ) - { - x = rhs.x; y = rhs.y; z = rhs.z; - return *this; - } + vector3& operator=( const vector3& rhs ); double x, y, z; }; -static std::ostream& operator<<( std::ostream& os, const point3& p ) -{ - os << "(" << p.x << ", " << p.y << ", " << p.z << ")"; - return os; -} +static std::ostream& operator<<( std::ostream& os, const vector3& p ); +point3 operator+( const point3& p, const vector3& v ); + /// An ordered set of points in 3D space. The convention /// is that these follow a right handed system with normal /// towards the observer starting in quadrant 1 i.e. for a @@ -65,12 +68,10 @@ struct quad3 { point3 a, b, c, d; + + quad3& operator=( const quad3& ); }; -static std::ostream& operator<<( std::ostream& os, const quad3& q ) -{ - os << "[" << q.a << ", " << q.b << ", " << q.c << ", " << q.d << "]"; - return os; -} +static std::ostream& operator<<( std::ostream& os, const quad3& q ); typedef std::list< quad3 > quad3_list; Modified: cinesuite/cineplay-cinecode/trunk/src/GridLayoutCallback.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/GridLayoutCallback.cpp 2008-08-08 08:40:38 UTC (rev 177) +++ cinesuite/cineplay-cinecode/trunk/src/GridLayoutCallback.cpp 2008-08-09 08:55:02 UTC (rev 178) @@ -106,6 +106,32 @@ return zero; } +bool grid_layout_callback::canMove( int ) +{ + return true; +} + +quad3 operator+( const quad3& q, const vector3& v ) +{ + quad3 result( q ); + result.a += v; + result.b += v; + result.c += v; + result.d += v; + + return result; +} + +void grid_layout_callback::move( int id, const vector3& v ) +{ + if ( id >= ws_->number_stores() ) + return; + + quad3_list::iterator I = quads_.begin(); + std::advance( I, id ); + *I = (*I + v); +} + int grid_layout_callback::get_features() const { return LAYOUT | SELECTION; Modified: cinesuite/cineplay-cinecode/trunk/src/GridLayoutCallback.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/GridLayoutCallback.h 2008-08-08 08:40:38 UTC (rev 177) +++ cinesuite/cineplay-cinecode/trunk/src/GridLayoutCallback.h 2008-08-09 08:55:02 UTC (rev 178) @@ -42,6 +42,8 @@ virtual void selected( int i ); virtual quad3 layout( int id ); virtual int get_features() const; + virtual bool canMove( int id ); + virtual void move( int id, const vector3& ); signals: void selectedChanged( int i ); Modified: cinesuite/cineplay-cinecode/trunk/src/common.pri =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/common.pri 2008-08-08 08:40:38 UTC (rev 177) +++ cinesuite/cineplay-cinecode/trunk/src/common.pri 2008-08-09 08:55:02 UTC (rev 178) @@ -76,4 +76,5 @@ log.cpp \ PlayerMultiplexer.cpp \ ScrollViewResizer.cpp \ - GridLayoutCallback.cpp + GridLayoutCallback.cpp \ + Geometry.cpp Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp 2008-08-08 08:40:38 UTC (rev 177) +++ cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp 2008-08-09 08:55:02 UTC (rev 178) @@ -338,13 +338,8 @@ double x = e->pos().x(); double y = e->pos().y(); - qDebug( "opengl_store_impl::mouseDoubleClickEvent: (%f, %f), callbacks: %i", x, y, callbacks_.size() ); - for ( int i=0; i<stores_.size(); ++i ) { - qDebug( "store %i: (%i, %i) -> (%i, %i)", i, - stores_[i]->media_->gx(), stores_[i]->media_->gy(), - stores_[i]->media_->gw(), stores_[i]->media_->gh() ); if ( stores_[i] && stores_[i]->media_ && stores_[i]->media_->contains( x, y ) ) { // do something @@ -354,8 +349,7 @@ { if ( (*I)->get_features() & widget_store_callback::SELECTION ) { - (*I)->selected( i ); - selected_internal_store_ = i; + (*I)->selected( stores_[i]->id_ ); break; } } @@ -368,9 +362,31 @@ void opengl_store_impl::mousePressEvent( QMouseEvent* e ) { mouse_down_location_ = e->pos(); + double x = e->pos().x(); + double y = e->pos().y(); + + for ( int i=0; i<stores_.size(); ++i ) + { + if ( stores_[i] && stores_[i]->media_ && stores_[i]->media_->contains( x, y ) ) + { + // do something + widget_store_callback_ptr_list::const_iterator I = callbacks_.begin(); + widget_store_callback_ptr_list::const_iterator E = callbacks_.end(); + for ( ; I!=E; ++I ) + { + if ( (*I)->get_features() & widget_store_callback::SELECTION ) + { + selected_internal_store_ = i; + break; + } + } + + break; + } + } } -void opengl_store_impl::mouseReleaseEvent( QMouseEvent* e ) +void opengl_store_impl::mouseReleaseEvent( QMouseEvent* ) { mouse_down_location_ = QPoint( -1, -1 ); } @@ -387,10 +403,13 @@ QPoint diff = e->pos() - mouse_down_location_; mouse_down_location_ = e->pos(); - // qDebug( "opengl_store_impl::mouseMoveEvent: panning by (%i, %i)", diff.x(), diff.y() ); - store->media_->x() += diff.x()/250.0; - store->media_->y() += diff.y()/250.0; - store->media_->set_dirty( true ); + if ( find_layout_callback() ) + find_layout_callback()->move( + store->id_, + vector3( + static_cast< double >( diff.x() )/owner_->width(), + static_cast< double >( diff.y() )/owner_->height(), + 0 ) ); owner_->update(); } Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/widget_store.hpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/widgets/widget_store.hpp 2008-08-08 08:40:38 UTC (rev 177) +++ cinesuite/cineplay-cinecode/trunk/src/widgets/widget_store.hpp 2008-08-09 08:55:02 UTC (rev 178) @@ -42,6 +42,8 @@ virtual void selected( int id ) = 0; virtual quad3 layout( int id ) = 0; + virtual bool canMove( int id ) = 0; + virtual void move( int id, const vector3& ) = 0; enum features { NONE = 0, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-08-21 22:58:55
|
Revision: 184 http://editopia.svn.sourceforge.net/editopia/?rev=184&view=rev Author: timdewhirst Date: 2008-08-21 22:58:48 +0000 (Thu, 21 Aug 2008) Log Message: ----------- cinefx - continuing work on Qt3/4 migration; WIP Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/AddFavouriteDlg.cpp cinesuite/cineplay-cinecode/trunk/src/AddFavouriteDlg.h cinesuite/cineplay-cinecode/trunk/src/Browser.cpp cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp cinesuite/cineplay-cinecode/trunk/src/CineCode.h cinesuite/cineplay-cinecode/trunk/src/Common.cpp cinesuite/cineplay-cinecode/trunk/src/Common.h cinesuite/cineplay-cinecode/trunk/src/Download.cpp cinesuite/cineplay-cinecode/trunk/src/Download.h cinesuite/cineplay-cinecode/trunk/src/EncodeJob.h cinesuite/cineplay-cinecode/trunk/src/EncodeTrayEntry.cpp cinesuite/cineplay-cinecode/trunk/src/EncodeTrayEntry.h cinesuite/cineplay-cinecode/trunk/src/FilterGraph.cpp cinesuite/cineplay-cinecode/trunk/src/Info.cpp cinesuite/cineplay-cinecode/trunk/src/Jah.h cinesuite/cineplay-cinecode/trunk/src/PlayList.cpp cinesuite/cineplay-cinecode/trunk/src/PlayList.h cinesuite/cineplay-cinecode/trunk/src/Player.cpp cinesuite/cineplay-cinecode/trunk/src/Release.cpp cinesuite/cineplay-cinecode/trunk/src/Release.h cinesuite/cineplay-cinecode/trunk/src/RemoveFavouriteDlg.cpp cinesuite/cineplay-cinecode/trunk/src/RemoveFavouriteDlg.h cinesuite/cineplay-cinecode/trunk/src/SkinDlg.cpp cinesuite/cineplay-cinecode/trunk/src/SkinDlg.h cinesuite/cineplay-cinecode/trunk/src/Tray.cpp cinesuite/cineplay-cinecode/trunk/src/Tray.h cinesuite/cineplay-cinecode/trunk/src/Utils.h cinesuite/cineplay-cinecode/trunk/src/cinecode.pro cinesuite/cineplay-cinecode/trunk/src/cineplay.pro cinesuite/cineplay-cinecode/trunk/src/common.pri cinesuite/cineplay-cinecode/trunk/src/config.pri cinesuite/cineplay-cinecode/trunk/src/jah.pri cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.hpp cinesuite/cineplay-cinecode/trunk/src/widgets/sdl_store.cpp cinesuite/cineplay-cinecode/trunk/src/widgets/slider.cpp cinesuite/cineplay-cinecode/trunk/src/widgets/slider.h cinesuite/cineplay-cinecode/trunk/src/widgets/timelineSlider.cpp cinesuite/cineplay-cinecode/trunk/src/widgets/widgetStack.cpp cinesuite/cineplay-cinecode/trunk/src/widgets/widgetStack.h cinesuite/cineplay-cinecode/trunk/src/widgets/widgets.pro cinesuite/cineplay-cinecode/trunk/src/windows/downloadDialog.ui cinesuite/cineplay-cinecode/trunk/src/windows/infoDialog.ui cinesuite/cineplay-cinecode/trunk/src/windows/toolbar.ui Added Paths: ----------- cinesuite/cineplay-cinecode/trunk/src/windows/filters.ui cinesuite/cineplay-cinecode/trunk/src/windows/main.ui cinesuite/cineplay-cinecode/trunk/src/windows/tray.ui Removed Paths: ------------- cinesuite/cineplay-cinecode/trunk/src/widgets/pushbutton.cpp cinesuite/cineplay-cinecode/trunk/src/widgets/pushbutton.h cinesuite/cineplay-cinecode/trunk/src/widgets/scrollview.hpp cinesuite/cineplay-cinecode/trunk/src/windows/ui_filters.ui cinesuite/cineplay-cinecode/trunk/src/windows/ui_main.ui cinesuite/cineplay-cinecode/trunk/src/windows/ui_tray.ui Modified: cinesuite/cineplay-cinecode/trunk/src/AddFavouriteDlg.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/AddFavouriteDlg.cpp 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/AddFavouriteDlg.cpp 2008-08-21 22:58:48 UTC (rev 184) @@ -1,62 +1,69 @@ -#include "AddFavouriteDlg.h" +/* -*- mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */ -#include "qfileinfo.h" -#include "qlineedit.h" -#include "qcheckbox.h" +// This file is part of Cineplay +// +// Cineplay is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// Cineplay is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +// +// Copyright (C) 2008 Audiotube Ltd. +// For more information, see http://www.audiotube.com +#include "AddFavouriteDlg.h" -class addFavInt : public addFav -{ -protected: - SkinDialog* m_skinDlg; +// qt +#include "QFileInfo" +#include "QLineEdit" +#include "QCheckBox" -public: - addFavInt( SkinDialog *dlg) { m_skinDlg = dlg; } - - void reject() - { - setResult( QDialog::Rejected ); - m_skinDlg->close(); - } -}; - AddFavouriteDlg::AddFavouriteDlg( QWidget *parent, - cineplay::CFavourites *favs, - const QString &lastFile, - int frame, - QImage thumbnail ) - : SkinDialog(parent), - m_thumbnail( thumbnail ) + cineplay::CFavourites *favs, + const QString &lastFile, + int frame, + QImage thumbnail ) + : SkinDialog(parent), + m_thumbnail( thumbnail ) { - m_currentFrame = frame; - m_favList = favs; - m_fav = new addFavInt(this); - - SetContentWidget( m_fav ); - - //make a nice name tobegin with - m_fname = lastFile; - - QFileInfo info(lastFile); - QString niceStr = info.baseName(); - - niceStr.replace('-', ' '); - niceStr.replace('_', ' '); - niceStr.replace('.', ' '); - - m_fav->nameEdit->setText( niceStr ); + QWidget* w = new QWidget( this ); + ui.setupUi( w ); + + m_currentFrame = frame; + m_favList = favs; + + SetContentWidget( w ); + + //make a nice name tobegin with + m_fname = lastFile; + + QFileInfo info(lastFile); + QString niceStr = info.baseName(); + + niceStr.replace('-', ' '); + niceStr.replace('_', ' '); + niceStr.replace('.', ' '); + + ui.nameEdit->setText( niceStr ); } void AddFavouriteDlg::accept() { - QString name = m_fav->nameEdit->text(); - if(name.isEmpty()) - name = m_fname; - - int frame = m_fav->positionChk->isChecked() ? m_currentFrame : -1; - m_favList->pushUrl( m_fname, name, m_thumbnail, frame ); - - SkinDialog::accept(); + QString name = ui.nameEdit->text(); + if( name.isEmpty() ) + name = m_fname; + + int frame = ui.positionChk->isChecked() ? m_currentFrame : -1; + m_favList->pushUrl( m_fname, name, m_thumbnail, frame ); + + SkinDialog::accept(); } Modified: cinesuite/cineplay-cinecode/trunk/src/AddFavouriteDlg.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/AddFavouriteDlg.h 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/AddFavouriteDlg.h 2008-08-21 22:58:48 UTC (rev 184) @@ -18,23 +18,23 @@ // Copyright (C) 2008 Audiotube Ltd. // For more information, see http://www.audiotube.com +#pragma once -#ifndef ADDFAVOURITEDLG_H -#define ADDFAVOURITEDLG_H - // local -#include "windows/addfav.h" #include "SkinDlg.h" #include "PlayList.h" +// generated +#include "ui_addfav.h" + // qt -#include <qimage.h> +#include <QImage> +#include <QString> class AddFavouriteDlg : public SkinDialog { protected: - - addFav* m_fav; + Ui::addFav ui; cineplay::CFavourites* m_favList; QString m_fname; QImage m_thumbnail; @@ -50,7 +50,3 @@ void accept(); }; - - - -#endif //ADDFAVOURITEDLG_H Modified: cinesuite/cineplay-cinecode/trunk/src/Browser.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Browser.cpp 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/Browser.cpp 2008-08-21 22:58:48 UTC (rev 184) @@ -9,11 +9,11 @@ // // Cineplay is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with this program. If not, see <http://www.gnu.org/licenses/>. // // Copyright (C) 2008 Audiotube Ltd. // For more information, see http://www.audiotube.com @@ -21,37 +21,38 @@ #include "Browser.h" // qt -#include <qurl.h> -#include <qstring.h> -#include <qstringlist.h> +#include <QUrl> +#include <QString> +#include <QStringList> +#include <QByteArray> #if defined( Q_OS_MACX ) #include <ApplicationServices/ApplicationServices.h> bool openBrowserWindow( const QUrl& url ) -{ - // ensure we have a protocol at the front - if ( url.protocol() != "http" && url.protocol() != "file" ) - { - qWarning( "openBrowserWindow: failed to find known protocol: %s", url.protocol().ascii() ); - return false; - } +{ + // ensure we have a protocol at the front + if ( url.protocol() != "http" && url.protocol() != "file" ) + { + qWarning() << "openBrowserWindow: failed to find known protocol:" << url.protocol(); + return false; + } - QCString utf8Url = ((QString)(url)).utf8(); - CFURLRef cfurl = CFURLCreateWithBytes(NULL, - (UInt8*) utf8Url.data(), (SInt32) utf8Url.length(), - kCFStringEncodingUTF8, /* no base URL */ NULL); + QByteArray utf8Url = url.toString().utf8(); + CFURLRef cfurl = CFURLCreateWithBytes(NULL, + (UInt8*) utf8Url.data(), (SInt32) utf8Url.length(), + kCFStringEncodingUTF8, /* no base URL */ NULL); - OSStatus err = LSOpenCFURLRef(cfurl, NULL); - if (err != noErr) - { - qWarning( "LSOpenCFURLRef failed with error %d", static_cast<int>(err) ); - return false; - } - - CFRelease(cfurl); - return true; + OSStatus err = LSOpenCFURLRef(cfurl, NULL); + if (err != noErr) + { + qWarning() << "LSOpenCFURLRef failed with error:" <<static_cast<int>(err); + return false; + } + + CFRelease(cfurl); + return true; } #elif defined( Q_OS_WIN32 ) @@ -61,34 +62,32 @@ bool openBrowserWindow( const QUrl& url_ ) { - QString action("open"); - QString url( url_ ); + QString action("open"); + QString url( url_ ); - HINSTANCE status = 0; - QCString a = action.local8Bit(); - QCString u = url.local8Bit(); - const char *aa = a; - const char *ua = u; + HINSTANCE status = 0; + QByteArray a = action.local8Bit(); + QByteArray u = url.local8Bit(); QT_WA( { - status = ::ShellExecute( NULL, - (TCHAR*)action.ucs2(), - (TCHAR*)url.ucs2(), - 0, - 0, - SW_SHOW); + status = ::ShellExecute( NULL, + (TCHAR*)action.ucs2(), + (TCHAR*)url.ucs2(), + 0, + 0, + SW_SHOW); }, { - status = ::ShellExecuteA( NULL, - a, - u, - 0, - 0, - SW_SHOW); + status = ::ShellExecuteA( NULL, + a, + u, + 0, + 0, + SW_SHOW); }); - return status; + return status; } #else @@ -100,66 +99,66 @@ bool openBrowserWindow( const QUrl& url ) { - // ensure we have a protocol at the front - if ( url.protocol() != "http" && url.protocol() != "file" ) - { - qWarning( "openBrowserWindow: failed to find known protocol: %s", url.protocol().ascii() ); - return false; - } + // ensure we have a protocol at the front + if ( url.protocol() != "http" && url.protocol() != "file" ) + { + qWarning() << "openBrowserWindow: failed to find known protocol:" << url.protocol(); + return false; + } - // try this strategy: - // - if BROWSER is set use it - // - if no BROWSER: - // - try a list of browsers - QString browser = getenv("BROWSER"); - if ( !browser.isEmpty() ) - { - browser += " " + url + " &"; + // try this strategy: + // - if BROWSER is set use it + // - if no BROWSER: + // - try a list of browsers + QString browser = getenv("BROWSER"); + if ( !browser.isEmpty() ) + { + browser += " " + url + " &"; - if ( system( browser ) != 0 ) - { - qWarning( "browser: failed to open %s, error: %s", browser.ascii(), strerror( errno ) ); - return false; - } + if ( system( browser ) != 0 ) + { + qWarning( "browser: failed to open %s, error: %s", browser.ascii(), strerror( errno ) ); + return false; + } - return true; - } + return true; + } - QStringList browserList; - browserList << "mozilla" << "firefox" << "netscape" << "opera"; + QStringList browserList; + browserList << "mozilla" << "firefox" << "netscape" << "opera"; - for ( QStringList::const_iterator I = browserList.begin(); I != browserList.end(); ++I ) - { - // check to see if the browser is running - int res = system( *I + " -remote \"ping()\"" ); - if ( res == 0 ) - { - // okay, soemthing is running... - // try this natty trick - QString process( *I + " -remote \"openURL(" + url + ", new-tab)\"" ); - res = system( process ); - if ( res == 0 ) - { - return true; - } + for ( QStringList::const_iterator I = browserList.begin(); I != browserList.end(); ++I ) + { + // check to see if the browser is running + int res = system( *I + " -remote \"ping()\"" ); + if ( res == 0 ) + { + // okay, soemthing is running... + // try this natty trick + QString process( *I + " -remote \"openURL(" + url + ", new-tab)\"" ); + res = system( process ); + if ( res == 0 ) + { + return true; + } - qDebug( "browser: failed to open tab: %s, error: %s", process.ascii(), strerror( errno ) ); - } - else - { - // just try to run the browser - QString process( *I + " " + url + " &" ); - res = system( process ); - if ( res == 0 ) - { - return true; - } + qDebug( "browser: failed to open tab: %s, error: %s", process.ascii(), strerror( errno ) ); + } + else + { + // just try to run the browser + QString process( *I + " " + url + " &" ); + res = system( process ); + if ( res == 0 ) + { + return true; + } - qWarning( "browser: failed to open app: %s, error: %s", process.ascii(), strerror( errno ) ); - } - } + qWarning( "browser: failed to open app: %s, error: %s", process.ascii(), strerror( errno ) ); + } + } - return false; + return false; } #endif Modified: cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp 2008-08-21 22:58:48 UTC (rev 184) @@ -37,16 +37,26 @@ // qt #include <qapplication.h> -#include <qgroupbox.h> -#include <qnetwork.h> +#include <q3groupbox.h> +#include <q3network.h> #include <qmenubar.h> #include <qmessagebox.h> #include <qlayout.h> -#include <qobjectlist.h> -#include <qvbox.h> +#include <qobject.h> +#include <q3vbox.h> #include <qstringlist.h> #include <qsettings.h> -#include <qwidgetstack.h> +#include <q3widgetstack.h> +//Added by qt3to4: +#include <QKeyEvent> +#include <QCustomEvent> +#include <Q3Frame> +#include <QDragEnterEvent> +#include <QDropEvent> +#include <QResizeEvent> +#include <Q3PopupMenu> +#include <QMouseEvent> +#include <Q3VBoxLayout> // olibs #include <openmedialib/ml/filter.hpp> @@ -76,7 +86,7 @@ m_impl->m_timeSlider->setProperty( "enableInOutControls", true ); // encode - QPopupMenu* encode = new QPopupMenu( m_impl->m_menubar ); + Q3PopupMenu* encode = new Q3PopupMenu( m_impl->m_menubar ); encode->setPalette( m_impl->m_menubar->palette() ); encode->insertItem( tr( "&encode..." ), this, SLOT( onEncode() ) ); encode->insertItem( tr( "&cancel all" ), this, SLOT( onCancelAll() ) ); @@ -116,24 +126,24 @@ connect( toggleRightTrayButton, SIGNAL( toggled( bool ) ), m_encodeTray, SLOT( setShown( bool ) ) ); // setup a scrollview - QVBoxLayout* placeholderLayout = new QVBoxLayout( m_encodeTray->placeholder() ); + Q3VBoxLayout* placeholderLayout = new Q3VBoxLayout( m_encodeTray->placeholder() ); placeholderLayout->setSpacing( 0 ); placeholderLayout->setMargin( 0 ); // set a widget stack - m_encodeStack = new QWidgetStack( m_encodeTray->placeholder() ); + m_encodeStack = new Q3WidgetStack( m_encodeTray->placeholder() ); placeholderLayout->addWidget( m_encodeStack ); { // create a container widget for encoding - QScrollView* sv = new QScrollView( m_encodeStack ); - sv->setFrameStyle( QFrame::NoFrame ); - sv->setHScrollBarMode( QScrollView::AlwaysOff ); - sv->setVScrollBarMode( QScrollView::AlwaysOn ); + Q3ScrollView* sv = new Q3ScrollView( m_encodeStack ); + sv->setFrameStyle( Q3Frame::NoFrame ); + sv->setHScrollBarMode( Q3ScrollView::AlwaysOff ); + sv->setVScrollBarMode( Q3ScrollView::AlwaysOn ); // setup a placeholder m_encodeTrayViewport = sv->viewport(); - m_encodeTrayPlaceholder = new QVBox( sv->viewport() ); + m_encodeTrayPlaceholder = new Q3VBox( sv->viewport() ); sv->addChild( m_encodeTrayPlaceholder ); m_encodeTrayPlaceholder->layout()->setAutoAdd( true ); @@ -142,14 +152,14 @@ { // create a container widget for favourites - QScrollView* sv = new QScrollView( m_encodeStack ); - sv->setFrameStyle( QFrame::NoFrame ); - sv->setHScrollBarMode( QScrollView::AlwaysOff ); - sv->setVScrollBarMode( QScrollView::AlwaysOn ); + Q3ScrollView* sv = new Q3ScrollView( m_encodeStack ); + sv->setFrameStyle( Q3Frame::NoFrame ); + sv->setHScrollBarMode( Q3ScrollView::AlwaysOff ); + sv->setVScrollBarMode( Q3ScrollView::AlwaysOn ); // setup a placeholder m_favouriteTrayViewport = sv->viewport(); - m_favouriteTrayPlaceholder = new QVBox( sv->viewport() ); + m_favouriteTrayPlaceholder = new Q3VBox( sv->viewport() ); sv->addChild( m_favouriteTrayPlaceholder ); m_favouriteTrayPlaceholder->layout()->setAutoAdd( true ); @@ -188,7 +198,7 @@ QWidget* toggleLeftTrayButton = CineUtils::FindWidget( "toggle_left_tray", this ); connect( toggleLeftTrayButton, SIGNAL( toggled( bool ) ), m_effectsTray, SLOT( setShown( bool ) ) ); - QVBoxLayout* layout = new QVBoxLayout( m_effectsTray->placeholder() ); + Q3VBoxLayout* layout = new Q3VBoxLayout( m_effectsTray->placeholder() ); m_effects = new ui_filters( m_effectsTray->placeholder() ); layout->addWidget( m_effects ); @@ -411,7 +421,7 @@ DEBUG_LOG; const QObjectList* children = m_encodeTrayPlaceholder->children(); - QPtrListIterator< QObject > I( *children ); + Q3PtrListIterator< QObject > I( *children ); typedef std::vector< QObject* > QObjectVector; QObjectVector toRemove; @@ -584,7 +594,7 @@ QApplication::setColorSpec( QApplication::CustomColor ); QApplication a( argc, argv ); - qInitNetworkProtocols(); + q3InitNetworkProtocols(); a.setStyle( new cineplay::Theme ); Modified: cinesuite/cineplay-cinecode/trunk/src/CineCode.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/CineCode.h 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/CineCode.h 2008-08-21 22:58:48 UTC (rev 184) @@ -30,10 +30,17 @@ // qt #include <qwidget.h> +//Added by qt3to4: +#include <QResizeEvent> +#include <QDragEnterEvent> +#include <QDropEvent> +#include <QCustomEvent> +#include <QMouseEvent> +#include <QKeyEvent> class Tray; class ui_filters; -class QWidgetStack; +class Q3WidgetStack; namespace cineplay { @@ -109,7 +116,7 @@ EncodeJobList m_encodeJobList; WidgetVector m_favouriteTrayEntries; - QWidgetStack* m_encodeStack; + Q3WidgetStack* m_encodeStack; FrameRangeList m_frameRanges; }; Modified: cinesuite/cineplay-cinecode/trunk/src/Common.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-08-21 22:58:48 UTC (rev 184) @@ -38,44 +38,47 @@ #include "OpenGLStore.h" #include "Utils.h" #include "Tray.h" -#include "windows/toolbar.h" -#include "windows/addfav.h" -#include "windows/removefav.h" -#include "windows/styledlg.h" #include "log.h" #include "GridLayoutCallback.h" +// generated +#include "ui_toolbar.h" +#include "ui_addfav.h" +#include "ui_removefav.h" +#include "ui_styledlg.h" + #ifdef BUILD_CINECODE -#include "windows/about_cinecode.h" +#include "ui_about_cinecode.h" #else -#include "windows/about.h" +#include "ui_about.h" #endif // qt -#include <qapplication.h> -#include <qcursor.h> -#include <qfiledialog.h> +#include <QApplication> +#include <QCursor> +#include <QFileDialog> #include <qstylefactory.h> #include <qvariant.h> #include <qmessagebox.h> #include <qsettings.h> #include <qdir.h> -#include <qdragobject.h> -#include <qevent.h> -#include <qlayout.h> -#include <qmenubar.h> -#include <qpopupmenu.h> -#include <qpushbutton.h> -#include <qlineedit.h> -#include <qcheckbox.h> +#include <QDragEnterEvent> +#include <QDropEvent> +#include <QEvent> +#include <QLayout> +#include <QMenu> +#include <QMenuBar> +#include <QPushButton> +#include <QLineEdit> +#include <QCheckBox> #include <qlistview.h> -#include <qnetwork.h> -#include <qregexp.h> -#include <qobjectlist.h> -#include <qthread.h> +#include <QRegExp> +#include <QThread> #include <qgl.h> -#include <qlabel.h> -#include <qbuffer.h> +#include <QLabel> +#include <QBuffer> +#include <QDesktopWidget> +#include <QUrl> // olibs #include <openpluginlib/pl/openpluginlib.hpp> @@ -117,7 +120,7 @@ , m_download( NULL ) , m_info( new Info( m_parent ) ) , m_ver_appload ( true ) - , m_release( new Release() ) + , m_release( new Release( this ) ) , m_release_dialog( NULL ) , m_checkRelease(1) , m_ioPointBlock(false) @@ -134,7 +137,9 @@ parent->setCaption( SETTINGS_APPTITLE ); QWidget *ht = CineUtils::FindWidget( WIDGET_TOOLBARPLACE, parent ); - QWidget *h2 = new toolbar( ht ); + QWidget *h2 = new QWidget( ht ); + Ui::toolbar ui; + ui.setupUi( h2 ); CineUtils::AddWidgetToParentLayout( ht, h2 ); CineUtils::ConnectButtonTo(parent, WIDGET_MINIMISE, m_parent, SLOT(showMinimized()) ); @@ -181,18 +186,13 @@ m_menubar = new QMenuBar( menubarPlaceholder ); m_menubar->setPalette( menubarPlaceholder->palette() ); - m_menubar->setFrameShape( QFrame::NoFrame ); - m_menubar->setFrameShadow( QFrame::Plain ); - m_menubar->setLineWidth( 0 ); - m_menubar->setMidLineWidth( 0 ); - m_menubar->setSeparator( QMenuBar::InWindowsStyle ); // file - m_fileMenu = new QPopupMenu( m_menubar ); + m_fileMenu = new QMenu( m_menubar ); // mru menu - m_mruMenu = new QPopupMenu( m_menubar ); - m_mruList.BuildMenu(m_mruMenu, this, SLOT( onMruSelected(int) ) ); + m_mruMenu = new QMenu( m_menubar ); + m_mruList.BuildMenu( m_mruMenu, this, SLOT( onMruSelected(int) ) ); m_mruMenu->setPalette( menubarPlaceholder->palette() ); m_fileMenu->setPalette( menubarPlaceholder->palette() ); @@ -210,7 +210,7 @@ m_menubar->insertItem( tr( "&File" ), m_fileMenu ); // view - m_menuView = new QPopupMenu( m_menubar ); + m_menuView = new QMenu( m_menubar ); m_menuView->setPalette( menubarPlaceholder->palette() ); m_menuViewHalfIndex = m_menuView->insertItem( tr( "&half size" ), this, SLOT( onViewHalfSize() ) ); m_menuViewNormalIndex = m_menuView->insertItem( tr( "&normal size" ), this, SLOT( onViewNormalSize() ) ); @@ -224,11 +224,11 @@ m_menubar->insertItem( tr( "&View" ), m_menuView ); // window - m_windowMenu = new QPopupMenu( m_menubar ); + m_windowMenu = new QMenu( m_menubar ); m_windowMenu->setPalette( menubarPlaceholder->palette() ); m_windowMenu->insertItem( tr( "&movie info" ), this, SLOT( onShowMovieInfo() ) ); - m_favMenu = new QPopupMenu( m_menubar ); + m_favMenu = new QMenu( m_menubar ); m_favList->BuildMenu(m_favMenu, this, SLOT( onFavSelected(int) ) ); m_favMenu->setPalette( menubarPlaceholder->palette() ); @@ -241,7 +241,7 @@ m_menubar->insertItem( tr( "&Videos" ), m_windowMenu ); // help - QPopupMenu* help = new QPopupMenu( m_menubar ); + QMenu* help = new QMenu( m_menubar ); help->setPalette( menubarPlaceholder->palette() ); help->insertItem( tr( "&help" ), this, SLOT( onHelp() ) ); help->insertItem( tr( "&check for updates" ), this, SLOT( onCheckVersion() ) ); @@ -479,7 +479,7 @@ storeTypeAudio = "sdl_audio"; storeTypeAudio += ":"; - m_audioStore = ml::create_store( storeTypeAudio, ml::frame_type_ptr() ); + m_audioStore = ml::create_store( storeTypeAudio.toStdWString(), ml::frame_type_ptr() ); audio_success &= ( m_audioStore != ml::store_type_ptr() ); if ( audio_success ) audio_success &= m_audioStore->init(); @@ -711,8 +711,8 @@ void Common::saveTrayStates() const { QByteArray traystates; - QBuffer buffer( traystates ); - buffer.open( IO_ReadWrite ); + QBuffer buffer( &traystates ); + buffer.open( QIODevice::ReadWrite ); if ( !m_trays.empty() ) { @@ -743,8 +743,8 @@ traystates = CineUtils::StringToQByteArray( settings.readEntry( SETTINGS_TRAYSTATES ) ); } - QBuffer buffer( traystates ); - buffer.open( IO_ReadOnly ); + QBuffer buffer( &traystates ); + buffer.open( QIODevice::ReadOnly ); QDataStream ds( &buffer ); while ( !ds.atEnd() ) @@ -842,7 +842,7 @@ DEBUG_LOG; if(m_release == 0) - m_release = new Release(); + m_release = new Release( this ); m_release->checkRelease( QString( CINE_VERSION ) ); connect( m_release, SIGNAL( done( const bool ) ), this, SLOT( checkVersionDone( const bool ) ) ); } @@ -1619,7 +1619,7 @@ } -void Common::customEvent(QCustomEvent* e) +void Common::customEvent(QEvent* e) { switch(e->type()) { Modified: cinesuite/cineplay-cinecode/trunk/src/Common.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Common.h 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/Common.h 2008-08-21 22:58:48 UTC (rev 184) @@ -27,11 +27,11 @@ #include "PlayerMultiplexer.hpp" // qt -#include <qobject.h> -#include <qstring.h> -#include <qrect.h> -#include <qmutex.h> -#include <qdatetime.h> +#include <QObject> +#include <QString> +#include <QRect> +#include <QMutex> +#include <QDateTime> // std #include <map> @@ -41,6 +41,7 @@ class Release; class ReleaseDlg; class Tray; +class QMenu; class QMenuBar; namespace cineplay @@ -132,7 +133,7 @@ void resizeEvent(QResizeEvent*); void dragEnterEvent(QDragEnterEvent *de); void dropEvent(QDropEvent *); - void customEvent(QCustomEvent* e); + void customEvent(QEvent* e); // interaction with in page video void onVideoSelected( int ); @@ -153,7 +154,7 @@ void SetVideoSize(const QSize &size, float scale = 1.0f); void SetSizeCheck(int index, bool set); void ClearSizeChecks(); - void BuildMruMenu(QPopupMenu *menu); + void BuildMruMenu( QMenu* menu ); void onLoad( bool isSequence ); QString GetLastPath(); void ShowBorderWidgets(bool show); @@ -185,18 +186,18 @@ bool m_playControlPopup; QMenuBar* m_menubar; - QPopupMenu* m_menuView; + QMenu* m_menuView; int m_menuViewHalfIndex; int m_menuViewNormalIndex; int m_menuViewDoubleIndex; int m_menuViewShowIndex; int m_menuViewLoopIndex; int m_menuViewPlayAllIndex; - QPopupMenu* m_fileMenu; - QPopupMenu* m_windowMenu; - QPopupMenu* m_mruMenu; + QMenu* m_fileMenu; + QMenu* m_windowMenu; + QMenu* m_mruMenu; int m_mruItemRef; - QPopupMenu* m_favMenu; + QMenu* m_favMenu; int m_favItemRef; QPoint m_dragClickPos; Modified: cinesuite/cineplay-cinecode/trunk/src/Download.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Download.cpp 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/Download.cpp 2008-08-21 22:58:48 UTC (rev 184) @@ -23,77 +23,46 @@ #include "SkinDlg.h" #include "Utils.h" +// generated +#include "ui_downloadDialog.h" + // qt -#include <qstring.h> -#include <qurl.h> -#include <qurloperator.h> -#include <qnetworkprotocol.h> -#include <qcstring.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qdir.h> -#include <qlineedit.h> -#include <qprogressbar.h> -#include <qpushbutton.h> +#include <QString> +#include <QUrl> +#include <QByteArray> +#include <QFile> +#include <QFileInfo> +#include <QDir> +#include <QLineEdit> +#include <QProgressBar> +#include <QPushButton> +#include <QHttp> +#include <QDebug> -// ui -#include "windows/downloadDialog.h" - - - -// -// We need this extra wrapper becuse Qt3 doesnt give us any nice way to -// -class DownloadDialogClose : public DownloadDialog -{ -protected: - SkinDialog *m_skinDlg; -public: - - DownloadDialogClose( SkinDialog *parent ) - { - m_skinDlg = parent; - } - - void reject() - { - setResult( QDialog::Rejected ); - m_skinDlg->close(); - } -}; - - - class Download::DownloadImpl : public QObject { Q_OBJECT public: - QUrlOperator op; + QHttp http; SkinDialog *skinDlg; - DownloadDialogClose *dialog; + Ui::DownloadDialog ui; QFile f; - DownloadImpl(QWidget *parent) + DownloadImpl( QWidget *parent ) { - skinDlg = new SkinDialog(parent); - dialog = new DownloadDialogClose(skinDlg); - skinDlg->SetContentWidget( dialog ); + skinDlg = new SkinDialog( parent ); + QWidget* w = new QWidget( skinDlg ); + ui.setupUi( w ); + skinDlg->SetContentWidget( w ); - connect( &op, SIGNAL( data( const QByteArray&, QNetworkOperation* ) ), - this, SLOT( onData( const QByteArray&, QNetworkOperation* ) ) ); - connect( &op, SIGNAL( dataTransferProgress( int, int, QNetworkOperation* ) ), - this, SLOT( onDataTransferProgress( int, int, QNetworkOperation* ) ) ); - connect( &op, SIGNAL( finished( QNetworkOperation* ) ), - this, SLOT( onFinished( QNetworkOperation* ) ) ); + connect( &http, SIGNAL( dataReadProgress( int, int ) ), this, SLOT( onDataReadProgress( int, int ) ) ); + connect( &http, SIGNAL( requestFinished( int, bool ) ), this, SLOT( onRequestFinished( int, bool ) ) ); + + connect( ui.fetch, SIGNAL( clicked() ), this, SLOT( onStart() ) ); + connect( ui.cancel, SIGNAL( clicked() ), this, SLOT( onCancel() ) ); - connect( dialog->fetch, SIGNAL( clicked() ), - this, SLOT( onStart() ) ); - connect( dialog->cancel, SIGNAL( clicked() ), - this, SLOT( onCancel() ) ); - - dialog->cancel->setEnabled( false ); - + ui.cancel->setEnabled( false ); } ~DownloadImpl() @@ -106,57 +75,51 @@ void done( const QString& ); private slots: - void onData( const QByteArray& d, QNetworkOperation* ) + void onDataReadProgress( int done, int total ) { - f.writeBlock( d ); + ui.progress->setProgress( done, total ); } - void onDataTransferProgress( int done, int total, QNetworkOperation* ) + void onRequestFinished( int, bool error ) { - dialog->progress->setProgress( done, total ); - } - - void onFinished( QNetworkOperation* nop ) - { - if ( nop->state() == QNetworkProtocol::StDone ) + if ( error ) { - f.close(); - - emit done( QFileInfo( f ).absFilePath() ); - dialog->fetch->setEnabled( true ); - dialog->cancel->setEnabled( false ); - + qWarning() << "DownloadImpl::onRequestFinished: failed to download file"; return; } - qWarning( "DownloadImpl::onFinished: failed to download file" ); + f.close(); + + emit done( QFileInfo( f ).absFilePath() ); + ui.fetch->setEnabled( true ); + ui.cancel->setEnabled( false ); } void onStart() { - dialog->fetch->setEnabled( false ); - dialog->cancel->setEnabled( true ); + ui.fetch->setEnabled( false ); + ui.cancel->setEnabled( true ); - QString url( dialog->url->text() ); + QString url( ui.url->text() ); QString extension( url.mid( url.findRev( "." ) - 1 ) ); - f.setName( CineUtils::createTemporaryFilename() + extension ); - if ( !f.open( IO_ReadWrite | IO_Raw ) ) + f.setFileName( CineUtils::createTemporaryFilename() + extension ); + if ( !f.open( QIODevice::ReadWrite ) ) { - qWarning( "DownloadImpl::onFinished: failed to open file" ); + qWarning() << "DownloadImpl::onFinished: failed to open file:" << f.fileName(); return; } - op.get( dialog->url->text() ); + http.get( ui.url->text(), &f ); } void onCancel() { - dialog->fetch->setEnabled( true ); - dialog->cancel->setEnabled( false ); - dialog->progress->setProgress( 0, 100 ); + ui.fetch->setEnabled( true ); + ui.cancel->setEnabled( false ); + ui.progress->setProgress( 0, 100 ); - op.stop(); + http.abort(); skinDlg->hide(); } Modified: cinesuite/cineplay-cinecode/trunk/src/Download.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Download.h 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/Download.h 2008-08-21 22:58:48 UTC (rev 184) @@ -22,7 +22,7 @@ #pragma once // qt -#include <qobject.h> +#include <QObject> class QString; class QUrl; Modified: cinesuite/cineplay-cinecode/trunk/src/EncodeJob.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/EncodeJob.h 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/EncodeJob.h 2008-08-21 22:58:48 UTC (rev 184) @@ -23,8 +23,8 @@ #include <qstring.h> #include <qstringlist.h> -#include <qvaluelist.h> -#include <qpopupmenu.h> +#include <q3valuelist.h> +#include <q3popupmenu.h> #include "FrameRange.h" Modified: cinesuite/cineplay-cinecode/trunk/src/EncodeTrayEntry.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/EncodeTrayEntry.cpp 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/EncodeTrayEntry.cpp 2008-08-21 22:58:48 UTC (rev 184) @@ -32,6 +32,8 @@ #include <qdir.h> #include <qobject.h> #include <qapplication.h> +//Added by qt3to4: +#include <QCustomEvent> enum State { Grey = 0, Modified: cinesuite/cineplay-cinecode/trunk/src/EncodeTrayEntry.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/EncodeTrayEntry.h 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/EncodeTrayEntry.h 2008-08-21 22:58:48 UTC (rev 184) @@ -22,6 +22,8 @@ // generated #include "windows/encode_tray_entry.h" +//Added by qt3to4: +#include <QCustomEvent> class EncodeCustomEvent; namespace cineplay { Modified: cinesuite/cineplay-cinecode/trunk/src/FilterGraph.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/FilterGraph.cpp 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/FilterGraph.cpp 2008-08-21 22:58:48 UTC (rev 184) @@ -779,7 +779,7 @@ // { QString qfname = CineUtils::ToQString(fileName); QFile f( qfname ); - if( !f.open(IO_ReadOnly) ) + if( !f.open(QIODevice::ReadOnly) ) throw FGException( "file not found", qfname.ascii() ); QString errorMsg; Modified: cinesuite/cineplay-cinecode/trunk/src/Info.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Info.cpp 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/Info.cpp 2008-08-21 22:58:48 UTC (rev 184) @@ -25,29 +25,29 @@ #include "log.h" // qt -#include <qwidget.h> -#include <qfileinfo.h> -#include <qlabel.h> -#include <qstring.h> +#include <QWidget> +#include <QFileInfo> +#include <QLabel> +#include <QString> // ui -#include "windows/infoDialog.h" +#include "ui_infoDialog.h" #include "SkinDlg.h" class Info::InfoImpl : public QObject { public: - - infoDialog *dialog; + Ui::infoDialog ui; SkinDialog *skinDlg; InfoImpl( QWidget* parent ) : QObject( parent ) { - dialog = new infoDialog; skinDlg = new SkinDialog(parent); - skinDlg->SetContentWidget(dialog); + QWidget* w = new QWidget( skinDlg ); + ui.setupUi( w ); + skinDlg->SetContentWidget( w ); } void show() { @@ -68,7 +68,7 @@ { DEBUG_LOG << filename.ascii(); - impl_->dialog->filename->setText( filename ); + impl_->ui.filename->setText( filename ); QFileInfo fi( filename ); double size = fi.size(); @@ -81,11 +81,11 @@ ++mult; } - impl_->dialog->filesize->setText( QString( "%1 %2" ) + impl_->ui.filesize->setText( QString( "%1 %2" ) .arg( size, 0, 'g', 4 ) .arg( multipliers[ mult ] ) ); - impl_->dialog->filetype->setText( filename.mid( filename.findRev( '.' ) + 1 ) ); + impl_->ui.filetype->setText( filename.mid( filename.findRev( '.' ) + 1 ) ); ml::input_type_ptr input = ml::create_input( filename.ascii() ); if ( !input ) @@ -101,9 +101,9 @@ { int fps_num, fps_den; frame->get_fps( fps_num, fps_den ); - impl_->dialog->fps->setText( QString( "%1" ).arg( (double)(fps_num)/fps_den, 0, 'g', 4 ) ); + impl_->ui.fps->setText( QString( "%1" ).arg( (double)(fps_num)/fps_den, 0, 'g', 4 ) ); - impl_->dialog->size->setText( QString( "%1 x %2" ).arg( image->width() ).arg( image->height() ) ); + impl_->ui.size->setText( QString( "%1 x %2" ).arg( image->width() ).arg( image->height() ) ); int frames = input->get_frames(); int length = frames * fps_den / fps_num; @@ -113,13 +113,13 @@ int ss = length - hh*3600 - mm*60; QString time; time.sprintf( "%02i:%02i:%02i", hh, mm, ss ); - impl_->dialog->duration->setText( time ); + impl_->ui.duration->setText( time ); } else { - impl_->dialog->fps->setText( tr( "---" ) ); - impl_->dialog->size->setText( tr( "-- x --" ) ); - impl_->dialog->duration->setText( tr( "--:--:--" ) ); + impl_->ui.fps->setText( tr( "---" ) ); + impl_->ui.size->setText( tr( "-- x --" ) ); + impl_->ui.duration->setText( tr( "--:--:--" ) ); } } @@ -127,12 +127,12 @@ { DEBUG_LOG; - impl_->dialog->filename->setText( tr( "n/a" ) ); - impl_->dialog->filesize->setText( tr( "n/a" ) ); - impl_->dialog->filetype->setText( tr( "n/a" ) ); - impl_->dialog->fps->setText( tr( "---" ) ); - impl_->dialog->size->setText( tr( "-- x --" ) ); - impl_->dialog->duration->setText( tr( "--:--:--" ) ); + impl_->ui.filename->setText( tr( "n/a" ) ); + impl_->ui.filesize->setText( tr( "n/a" ) ); + impl_->ui.filetype->setText( tr( "n/a" ) ); + impl_->ui.fps->setText( tr( "---" ) ); + impl_->ui.size->setText( tr( "-- x --" ) ); + impl_->ui.duration->setText( tr( "--:--:--" ) ); } void Info::show() Modified: cinesuite/cineplay-cinecode/trunk/src/Jah.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Jah.h 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/Jah.h 2008-08-21 22:58:48 UTC (rev 184) @@ -24,8 +24,6 @@ #include <openpluginlib/pl/timer.hpp> #include <openmedialib/ml/openmedialib_plugin.hpp> -#include "scrollview.hpp" -#include "pushbutton.h" #include "widget_store.hpp" #include "sdl_store.hpp" #include "opengl_store.hpp" Modified: cinesuite/cineplay-cinecode/trunk/src/PlayList.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/PlayList.cpp 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/PlayList.cpp 2008-08-21 22:58:48 UTC (rev 184) @@ -24,9 +24,9 @@ #include "Utils.h" #include "log.h" -#include <qsettings.h> -#include <qpopupmenu.h> -#include <qfile.h> +#include <QSettings> +#include <QMenu> +#include <QFile> namespace cineplay { @@ -125,7 +125,7 @@ return m_urls.first(); } - void CMruList::BuildMenu( QPopupMenu *menu, QObject *receiver, const char *slot ) + void CMruList::BuildMenu( QMenu *menu, QObject *receiver, const char *slot ) { DEBUG_LOG; @@ -276,7 +276,7 @@ } - void CFavourites::BuildMenu(QPopupMenu *menu, QObject *receiver, const char *slot) + void CFavourites::BuildMenu( QMenu* menu, QObject* receiver, const char* slot ) { DEBUG_LOG; Modified: cinesuite/cineplay-cinecode/trunk/src/PlayList.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/PlayList.h 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/PlayList.h 2008-08-21 22:58:48 UTC (rev 184) @@ -23,13 +23,13 @@ #define CINEPLAY_PLAYLIST_H -#include <qstring.h> -#include <qstringlist.h> -#include <qvaluelist.h> -#include <qimage.h> -#include <qobject.h> +#include <QString> +#include <QStringList> +#include <QList> +#include <QImage> +#include <QObject> -class QPopupMenu; +class QMenu; namespace cineplay { @@ -50,7 +50,7 @@ QString getLastestUrl(); QString getUrl(unsigned int index); QStringList getUrls() { return m_urls; } - void BuildMenu(QPopupMenu *menu, QObject *receiver, const char *slot); + void BuildMenu( QMenu* menu, QObject* receiver, const char* slot ); }; @@ -64,8 +64,17 @@ int frameNumber; QString name; QImage thumbnail; + + bool operator==( const Data& rhs ) + { + return + url == rhs.url && + frameNumber == rhs.frameNumber && + name == rhs.name && + thumbnail == rhs.thumbnail; + } }; - typedef QValueList< Data > DataList; + typedef QList< Data > DataList; DataList m_data; @@ -84,7 +93,7 @@ unsigned int getEntryCount() { return static_cast<unsigned int>( m_data.size() ); } void removeEntry(unsigned int ref); - void BuildMenu( QPopupMenu *menu, QObject *receiver, const char *slot ); + void BuildMenu( QMenu* menu, QObject* receiver, const char* slot ); signals: void changed(); Modified: cinesuite/cineplay-cinecode/trunk/src/Player.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Player.cpp 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/Player.cpp 2008-08-21 22:58:48 UTC (rev 184) @@ -25,9 +25,9 @@ #include "log.h" // qt -#include <qthread.h> -#include <qmutex.h> -#include <qwaitcondition.h> +#include <QThread> +#include <QMutex> +#include <QWaitCondition> // boost #include <boost/enable_shared_from_this.hpp> @@ -85,7 +85,7 @@ static QMutex m_mutex; }; - QMutex LoadCommand::m_mutex = QMutex(); + QMutex LoadCommand::m_mutex; class PlayCommand : public PlayerCommand { Modified: cinesuite/cineplay-cinecode/trunk/src/Release.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Release.cpp 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/Release.cpp 2008-08-21 22:58:48 UTC (rev 184) @@ -21,79 +21,53 @@ #include "Release.h" // qt -#include <qstringlist.h> +#include <QStringList> +#include <QString> +#include <QHttp> +#include <QUrl> +#include <QFile> +#include <QDebug> +#include <QTextStream> -void Release::onFile( const QByteArray& d, QNetworkOperation* ) +class Release::ReleasePrivate : public QObject { - f.writeBlock( d ); -} + Q_OBJECT -void Release::onFileTransferProgress( int /*done*/, int /*total*/, QNetworkOperation* ) -{ -} - -void Release::onFileFinished( QNetworkOperation* nop ) -{ - if ( nop->state() == QNetworkProtocol::StDone ) +public: + ReleasePrivate( QObject* p ) + : QObject( p ) { - f.close(); - getVersion(); - - emit done( upflag ); - return; + connect( &http, SIGNAL( requestFinished( int, bool ) ), this, SLOT( onRequestFinished( int, bool ) ) ); } - qWarning( "Release::onFileFinished: failed to check version" ); -} - -void Release::onFileCancel() -{ - op.stop(); -} - -void Release::onStart( const QString& ver ) -{ - version = ver.latin1(); -#ifdef BUILD_CINECODE - QString url( "http://updates.cinefx.org/cinecode/cinecode.txt" ); - QString str = "cinecode.txt"; -#else - QString url( "http://updates.cinefx.org/cineplay/cineplay.txt" ); - QString str = "cineplay.txt"; -#endif - - f.setName( str ); - if ( !f.open( IO_ReadWrite | IO_Raw ) ) + ~ReleasePrivate() { - qWarning( "Release::onStart: failed to open file" ); - return; + if ( f.isOpen() ) + f.close(); } - op.get( url.latin1() ); -} + void getVersion() + { + if ( !f.open( QIODevice::ReadOnly ) ) + { + qWarning() << "ReleasePrivate::getVersion: failed to open file"; + return; + } -void Release::getVersion() -{ - if ( !f.open( IO_ReadWrite | IO_Raw ) ) - { - qWarning( "Release::getVersion: failed to open file" ); - return; - } + QTextStream in(&f); + QString str; + while ( !in.atEnd() ) + { + str = in.readLine(); + break; + } - QTextStream in(&f); - QString str; - while (!in.atEnd()) { - str = in.readLine(); - break; - } + if ( str.isEmpty() ) + return; - if (str.isEmpty()) - return; - - if ( str.latin1() ) { - qDebug("Release::getVersion: %s %s", str.latin1(), version.latin1() ); - QStringList target = QStringList::split( '.', str ); - QStringList local = QStringList::split( '.', version ); + qDebug() << "ReleasePrivate::getVersion:" << str << version; + QStringList target = str.split( '.' ); + QStringList local = str.split( '.' ); if ( target == local ) { @@ -146,9 +120,60 @@ upflag = 0; } + + QString version; + QHttp http; + QFile f; + bool upflag; + +public slots: + void onRequestFinished( int, bool error ) + { + if ( error ) + { + qWarning() << "ReleasePrivate::onRequestFinished: failed to get version information"; + return; + } + + f.close(); + getVersion(); + + emit done( upflag ); + return; + } + +signals: + void done( bool ); +}; + +#include "Release.moc" + +Release::Release( QObject* parent ) + : QObject( parent ), + impl_( new ReleasePrivate( this ) ) +{ + connect( impl_, SIGNAL( done( bool ) ), this, SIGNAL( done( bool ) ) ); } -void Release::checkRelease( const QString& ver ) +Release::~Release() +{} + +void Release::checkRelease( const QString& version ) { - onStart( ver ); +#ifdef BUILD_CINECODE + QString url( "http://updates.cinefx.org/cinecode/cinecode.txt" ); + QString str = "cinecode.txt"; +#else + QString url( "http://updates.cinefx.org/cineplay/cineplay.txt" ); + QString str = "cineplay.txt"; +#endif + + impl_->f.setFileName( str ); + if ( !impl_->f.open( QIODevice::ReadWrite | QIODevice::Truncate ) ) + { + qWarning() << "Release::onStart: failed to open file"; + return; + } + + impl_->http.get( url, &impl_->f ); } Modified: cinesuite/cineplay-cinecode/trunk/src/Release.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Release.h 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/Release.h 2008-08-21 22:58:48 UTC (rev 184) @@ -22,60 +22,27 @@ #pragma once // qt -#include <qobject.h> -#include <qfileinfo.h> -#include <qstring.h> -#include <qurl.h> -#include <qmutex.h> -#include <qurloperator.h> -#include <qnetworkprotocol.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qdir.h> +#include <QObject> #include "Version.h" class QString; -class QUrl; class Release : public QObject { Q_OBJECT public: - QString version; - QUrlOperator op; - QFile f; - bool upflag; + Release( QObject* ); + ~Release(); - Release() - { - connect( &op, SIGNAL( data( const QByteArray&, QNetworkOperation* ) ), - this, SLOT( onFile( const QByteArray&, QNetworkOperation* ) ) ); - connect( &op, SIGNAL( dataTransferProgress( int, int, QNetworkOperation* ) ), - this, SLOT( onFileTransferProgress( int, int, QNetworkOperation* ) ) ); - connect( &op, SIGNAL( finished( QNetworkOperation* ) ), - this, SLOT( onFileFinished( QNetworkOperation* ) ) ); - } - - ~Release() - { - if ( f.isOpen() ) - f.close(); - } void checkRelease( const QString& ); signals: void done( const bool ); -private slots: - void onFile( const QByteArray& d, QNetworkOperation* ); - void onFileTransferProgress( int, int, QNetworkOperation* ); - void onFileFinished( QNetworkOperation* ); - void onFileCancel(); - private: - void onStart( const QString& ); - void getVersion(); + class ReleasePrivate; + ReleasePrivate* impl_; }; Modified: cinesuite/cineplay-cinecode/trunk/src/RemoveFavouriteDlg.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/RemoveFavouriteDlg.cpp 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/RemoveFavouriteDlg.cpp 2008-08-21 22:58:48 UTC (rev 184) @@ -1,40 +1,39 @@ +/* -*- mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */ + +// This file is part of Cineplay +// +// Cineplay is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// Cineplay is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +// +// Copyright (C) 2008 Audiotube Ltd. +// For more information, see http://www.audiotube.com + #include "RemoveFavouriteDlg.h" +// qt #include "qlistview.h" - -class removeFavInt : public removeFav +RemoveFavouriteDlg::RemoveFavouriteDlg( QWidget* parent, cineplay::CFavourites* favs ) + : SkinDialog( parent ) { -protected: - SkinDialog* m_skinDlg; -public: - - removeFavInt( SkinDialog *dlg) { m_skinDlg = dlg; } - - void accept() - { - setResult( QDialog::Accepted ); - m_skinDlg->close(); - } - void reject() - { - setResult( QDialog::Rejected ); - m_skinDlg->close(); - } -}; - - - - -RemoveFavouriteDlg::RemoveFavouriteDlg(QWidget *parent, cineplay::CFavourites *favs) : SkinDialog(parent) -{ - m_fav = new removeFavInt(this); + QWidget* w = new QWidget( this ); + ui.setupUi( w ); m_favList = favs; - SetContentWidget( m_fav ); + SetContentWidget( w ); - m_fav->favList->setSorting(-1); + ui.favList->setSorting(-1); unsigned int count = m_favList->getEntryCount(); @@ -46,7 +45,7 @@ if(num != -1) frameString = QString::number(num); - (void) new QListViewItem(m_fav->favList, m_favList->getName(t), frameString, m_favList->getUrl(t)); + (void) new QListViewItem( ui.favList, m_favList->getName(t), frameString, m_favList->getUrl(t)); } ConnectCtrlButton("Delete", true); @@ -55,11 +54,11 @@ void RemoveFavouriteDlg::accept() { - QListViewItem *sel = m_fav->favList->selectedItem(); + QListViewItem *sel = ui.favList->selectedItem(); if(sel) { - QListViewItem *ptr = m_fav->favList->firstChild(); + QListViewItem *ptr = ui.favList->firstChild(); int counter = 0; while(ptr) Modified: cinesuite/cineplay-cinecode/trunk/src/RemoveFavouriteDlg.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/RemoveFavouriteDlg.h 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/RemoveFavouriteDlg.h 2008-08-21 22:58:48 UTC (rev 184) @@ -18,12 +18,12 @@ // Copyright (C) 2008 Audiotube Ltd. // For more information, see http://www.audiotube.com +#pragma once -#ifndef REMOVEFAVOURITEDLG_H -#define REMOVEFAVOURITEDLG_H +// generated +#include "ui_removefav.h" - -#include "windows/removefav.h" +// local #include "SkinDlg.h" #include "PlayList.h" @@ -31,17 +31,11 @@ class RemoveFavouriteDlg : public SkinDialog { protected: - - removeFav* m_fav; + Ui::removeFav ui; cineplay::CFavourites* m_favList; public: - RemoveFavouriteDlg( QWidget *parent, cineplay::CFavourites *favs ); void accept(); }; - - - -#endif //REMOVEFAVOURITEDLG_H Modified: cinesuite/cineplay-cinecode/trunk/src/SkinDlg.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/SkinDlg.cpp 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/SkinDlg.cpp 2008-08-21 22:58:48 UTC (rev 184) @@ -24,14 +24,17 @@ #include "Utils.h" // qt -#include <qobjectlist.h> -#include <qlayout.h> -#include <qcursor.h> +#include <QObjectList> +#include <QLayout> +#include <QCursor> SkinDialog::SkinDialog( QWidget* parent ) - : styledlg( parent, "dlg", TRUE, Qt::WStyle_Customize | Qt::WStyle_NoBorder ) + : QDialog( parent ) { + setWindowFlags( Qt::FramelessWindowHint | Qt::CustomizeWindowHint ); + ui.setupUi( this ); + m_titleClickWidget = CineUtils::FindWidget( "style_titlebar_center", this ); m_allowResize = true; Modified: cinesuite/cineplay-cinecode/trunk/src/SkinDlg.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/SkinDlg.h 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/SkinDlg.h 2008-08-21 22:58:48 UTC (rev 184) @@ -21,13 +21,16 @@ #pragma once -#include "windows/styledlg.h" +// qt +#include <QDialog> +// generated +#include "ui_styledlg.h" -class SkinDialog : public styledlg +class SkinDialog : public QDialog { protected: - + Ui::styledlg ui; QWidget* m_titleClickWidget; QWidget* m_contentWidget; bool m_draggingApp; Modified: cinesuite/cineplay-cinecode/trunk/src/Tray.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Tray.cpp 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/Tray.cpp 2008-08-21 22:58:48 UTC (rev 184) @@ -30,10 +30,13 @@ const static int INSET = 10; Tray::Tray( QWidget* parent, Location location, int width ) - : tray( parent, 0, Qt::WStyle_Tool | Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WType_TopLevel ), - location_( location ), + : QWidget( parent ), + location_( location ), dimension_( width ) { + setWidgetAttributes( Qt::WStyle_Tool | Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WType_TopLevel ); + ui.setupUi( this ); + switch ( location_ ) { case LOCATION_TOP: Modified: cinesuite/cineplay-cinecode/trunk/src/Tray.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Tray.h 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/Tray.h 2008-08-21 22:58:48 UTC (rev 184) @@ -21,7 +21,7 @@ #pragma once // generated -#include "windows/ui_tray.h" +#include "ui_tray.h" // qt #include <qwidget.h> @@ -31,7 +31,7 @@ class QDataStream; /// a tray widget that can be placed on any edge of the top level window -class Tray : public tray +class Tray : public QWidget { public: enum Location { LOCATION_TOP, @@ -52,6 +52,8 @@ private: Location location_; int dimension_; + + Ui::tray ui; }; QDataStream& operator<<( QDataStream& s, const Tray& ); Modified: cinesuite/cineplay-cinecode/trunk/src/Utils.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Utils.h 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/Utils.h 2008-08-21 22:58:48 UTC (rev 184) @@ -21,9 +21,9 @@ #pragma once // qt -#include <qstring.h> -#include <qcstring.h> -#include <qimage.h> +#include <QString> +#include <QByteArray> +#include <QImage> // opl #include <openpluginlib/pl/string.hpp> Modified: cinesuite/cineplay-cinecode/trunk/src/cinecode.pro =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/cinecode.pro 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/cinecode.pro 2008-08-21 22:58:48 UTC (rev 184) @@ -23,3 +23,5 @@ EncodeJob.cpp \ EncodeTrayEntry.cpp \ FilterGraph.cpp + + Modified: cinesuite/cineplay-cinecode/trunk/src/cineplay.pro =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/cineplay.pro 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/cineplay.pro 2008-08-21 22:58:48 UTC (rev 184) @@ -5,7 +5,7 @@ include( common.pri ) FORMS += \ - windows/ui_main.ui \ + windows/main.ui \ windows/about.ui HEADERS += \ Modified: cinesuite/cineplay-cinecode/trunk/src/common.pri =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/common.pri 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/common.pri 2008-08-21 22:58:48 UTC (rev 184) @@ -9,7 +9,7 @@ # Input macx { - LIBS+= -framework Cocoa -framework CoreFoundation + LIBS+= -framework Cocoa -framework CoreFoundation } FORMS += \ @@ -20,8 +20,8 @@ windows/removefav.ui \ windows/infoDialog.ui \ windows/styledlg.ui \ - windows/ui_tray.ui \ - windows/ui_filters.ui \ + windows/tray.ui \ + windows/filters.ui \ windows/favorite_tray_entry.ui HEADERS += \ Modified: cinesuite/cineplay-cinecode/trunk/src/config.pri =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/config.pri 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/config.pri 2008-08-21 22:58:48 UTC (rev 184) @@ -1,17 +1,18 @@ -CONFIG += thread qt warn_on opengl +CONFIG += qt warn_on CONFIG += release #CONFIG += console +QT += xml network qt3support opengl win32 { - BUILD_ID = "$$system( c:\cygwin\bin\date.exe +%A-%H:%M-%d%m%Y )" + BUILD_ID = \\\"$$system( c:\cygwin\bin\date.exe +%A-%H:%M-%d%m%Y )\\\" } !win32 { - BUILD_ID = "$$system( date +%A-%H:%M-%d%m%Y )" + BUILD_ID = \\\"$$system( date +%A-%H:%M-%d%m%Y )\\\" } message( BUILD_ID is set to: $$BUILD_ID ) -DEFINES += BUILD_ID=\"$$BUILD_ID\" +DEFINES += BUILD_ID="\"$$BUILD_ID\"" win32 { QMAKE_CXXFLAGS_RELEASE += /Zi /Od Modified: cinesuite/cineplay-cinecode/trunk/src/jah.pri =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/jah.pri 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/jah.pri 2008-08-21 22:58:48 UTC (rev 184) @@ -5,19 +5,16 @@ win32:DEFINES += WIDGETS_EXPORTS HEADERS += \ - pushbutton.h \ timelineSlider.h \ slider.h \ label.h \ progress.h \ - scrollview.hpp \ widget_store.hpp \ sdl_store.hpp \ valueFormatters.h \ widgetStack.h SOURCES += \ - pushbutton.cpp \ timelineSlider.cpp \ slider.cpp \ sdl_store.cpp \ Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp 2008-08-21 22:58:48 UTC (rev 184) @@ -1049,5 +1049,3 @@ } } -#include "opengl_store.moc" - Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.hpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.hpp 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.hpp 2008-08-21 22:58:48 UTC (rev 184) @@ -20,7 +20,7 @@ #include "shader_state.h" // qt -#include <qgl.h> +#include <QGLWidget> // oml #include <openmedialib/ml/store.hpp> Deleted: cinesuite/cineplay-cinecode/trunk/src/widgets/pushbutton.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/widgets/pushbutton.cpp 2008-08-21 21:24:38 UTC (rev 183) +++ cinesuite/cineplay-cinecode/trunk/src/widgets/pushbutton.cpp 2008-08-21 22:58:48 UTC (rev 184) @@ -1,319 +0,0 @@ -/* -*- tab-width: 4... [truncated message content] |
From: <tim...@us...> - 2008-08-25 10:18:09
|
Revision: 185 http://editopia.svn.sourceforge.net/editopia/?rev=185&view=rev Author: timdewhirst Date: 2008-08-25 10:18:02 +0000 (Mon, 25 Aug 2008) Log Message: ----------- cinefx - more on Qt4 migration Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp cinesuite/cineplay-cinecode/trunk/src/CineCode.h cinesuite/cineplay-cinecode/trunk/src/CinePlay.cpp cinesuite/cineplay-cinecode/trunk/src/Command.cpp cinesuite/cineplay-cinecode/trunk/src/Command.h cinesuite/cineplay-cinecode/trunk/src/Common.cpp cinesuite/cineplay-cinecode/trunk/src/Download.cpp cinesuite/cineplay-cinecode/trunk/src/Download.h cinesuite/cineplay-cinecode/trunk/src/EncodeTrayEntry.cpp cinesuite/cineplay-cinecode/trunk/src/EncodeTrayEntry.h cinesuite/cineplay-cinecode/trunk/src/FavoriteTrayEntry.cpp cinesuite/cineplay-cinecode/trunk/src/FavoriteTrayEntry.h cinesuite/cineplay-cinecode/trunk/src/Jah.h cinesuite/cineplay-cinecode/trunk/src/LogMessageHandler.h cinesuite/cineplay-cinecode/trunk/src/OpenGLStore.cpp cinesuite/cineplay-cinecode/trunk/src/ReleaseDlg.cpp cinesuite/cineplay-cinecode/trunk/src/RemoveFavouriteDlg.cpp cinesuite/cineplay-cinecode/trunk/src/RemoveFavouriteDlg.h cinesuite/cineplay-cinecode/trunk/src/ScrollViewResizer.cpp cinesuite/cineplay-cinecode/trunk/src/SkinDlg.cpp cinesuite/cineplay-cinecode/trunk/src/Tray.cpp cinesuite/cineplay-cinecode/trunk/src/Utils.cpp cinesuite/cineplay-cinecode/trunk/src/common.pri cinesuite/cineplay-cinecode/trunk/src/widgets/progress.h cinesuite/cineplay-cinecode/trunk/src/widgets/widgetStack.cpp cinesuite/cineplay-cinecode/trunk/src/widgets/widgetStack.h cinesuite/cineplay-cinecode/trunk/src/windows/about.ui cinesuite/cineplay-cinecode/trunk/src/windows/about_cinecode.ui cinesuite/cineplay-cinecode/trunk/src/windows/encode_tray_entry.ui cinesuite/cineplay-cinecode/trunk/src/windows/favorite_tray_entry.ui cinesuite/cineplay-cinecode/trunk/src/windows/main_cinecode.ui cinesuite/cineplay-cinecode/trunk/src/windows/releaseDialog.ui cinesuite/cineplay-cinecode/trunk/src/windows/removefav.ui Added Paths: ----------- cinesuite/cineplay-cinecode/trunk/src/about.cpp cinesuite/cineplay-cinecode/trunk/src/about.h Removed Paths: ------------- cinesuite/cineplay-cinecode/trunk/src/Theme.cpp cinesuite/cineplay-cinecode/trunk/src/Theme.h Modified: cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp 2008-08-25 10:18:02 UTC (rev 185) @@ -21,7 +21,6 @@ // local #include "CineCode.h" #include "Common.h" -#include "Theme.h" #include "Tray.h" #include "Utils.h" #include "EncodeJob.h" @@ -47,6 +46,7 @@ #include <qstringlist.h> #include <qsettings.h> #include <q3widgetstack.h> + //Added by qt3to4: #include <QKeyEvent> #include <QCustomEvent> @@ -74,11 +74,14 @@ }; CineCode::CineCode( QWidget *parent, const char *name ) - : Main( parent, name, Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WType_TopLevel ), + : QWidget( parent, name ), m_impl( new Common( this ) ) { DEBUG_LOG; + ui.setupUi( this ); + setWindowFlags( Qt::FramelessWindowHint | Qt::Window ); + //general main window setup setAcceptDrops( true ); @@ -596,8 +599,6 @@ q3InitNetworkProtocols(); - a.setStyle( new cineplay::Theme ); - cineplay::CineCode* w = new cineplay::CineCode; a.setMainWidget( w ); Modified: cinesuite/cineplay-cinecode/trunk/src/CineCode.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/CineCode.h 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/CineCode.h 2008-08-25 10:18:02 UTC (rev 185) @@ -21,7 +21,7 @@ #pragma once -#include "windows/main_cinecode.h" +#include "ui_main_cinecode.h" #include "frameRange.h" // std @@ -48,7 +48,7 @@ class Common; class EncodeJob; -class CineCode : public Main +class CineCode : public QWidget { Q_OBJECT @@ -118,7 +118,9 @@ Q3WidgetStack* m_encodeStack; FrameRangeList m_frameRanges; + + Ui::Main ui; }; + } //namespace cineplay - Modified: cinesuite/cineplay-cinecode/trunk/src/CinePlay.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/CinePlay.cpp 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/CinePlay.cpp 2008-08-25 10:18:02 UTC (rev 185) @@ -21,7 +21,6 @@ // local #include "CinePlay.h" #include "Common.h" -#include "Theme.h" #include "Tray.h" #include "Utils.h" #include "PlayList.h" @@ -236,8 +235,6 @@ qInitNetworkProtocols(); - a.setStyle( new cineplay::Theme ); - cineplay::CinePlay* app = new cineplay::CinePlay; a.setMainWidget( app ); Modified: cinesuite/cineplay-cinecode/trunk/src/Command.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Command.cpp 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/Command.cpp 2008-08-25 10:18:02 UTC (rev 185) @@ -79,7 +79,8 @@ void CommandQueue::waitForCommands() { - m_condition.wait(); + m_pMutex->lock(); + m_condition.wait( m_pMutex.get() ); } } //namespace cineplay Modified: cinesuite/cineplay-cinecode/trunk/src/Command.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Command.h 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/Command.h 2008-08-25 10:18:02 UTC (rev 185) @@ -23,8 +23,8 @@ #include <boost/shared_ptr.hpp> #include <deque> -#include "qmutex.h" -#include "qwaitcondition.h" +#include <QMutex> +#include <QWaitCondition> Modified: cinesuite/cineplay-cinecode/trunk/src/Common.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-08-25 10:18:02 UTC (rev 185) @@ -40,6 +40,7 @@ #include "Tray.h" #include "log.h" #include "GridLayoutCallback.h" +#include "about.h" // generated #include "ui_toolbar.h" @@ -47,12 +48,6 @@ #include "ui_removefav.h" #include "ui_styledlg.h" -#ifdef BUILD_CINECODE -#include "ui_about_cinecode.h" -#else -#include "ui_about.h" -#endif - // qt #include <QApplication> #include <QCursor> @@ -825,16 +820,8 @@ { DEBUG_LOG; - SkinDialog dlg( m_parent ); - - dlg.SetAllowResize(false); AboutDialog *about = new AboutDialog; - QString versionString = "Version: "; - versionString += CINE_VERSION; - about->versionLabel->setText( versionString ); - dlg.SetContentWidget( about ); - - dlg.exec(); + about->exec(); } void Common::onCheckVersion() @@ -1445,7 +1432,7 @@ m_resizingApp = true; m_dragClickPos = pt; m_dragAppSize = m_parent->size(); - m_parent->setCursor(QCursor::sizeFDiagCursor); + m_parent->setCursor( Qt::sizeFDiagCursor ); } } } @@ -1472,7 +1459,7 @@ m_draggingApp = false; m_resizingApp = false; - m_parent->setCursor(QCursor::arrowCursor); + m_parent->setCursor( Qt::arrowCursor ); } @@ -1526,9 +1513,9 @@ { QPoint pt = event->pos(); if(IsResizePos(pt)) - m_parent->setCursor(QCursor::sizeFDiagCursor); + m_parent->setCursor( Qt::sizeFDiagCursor ); else - m_parent->setCursor(QCursor::arrowCursor); + m_parent->setCursor( Qt::arrowCursor ); } } } @@ -1581,7 +1568,8 @@ if ( items.size() == 1 ) { m_parent->setActiveWindow(); - LoadInput( QUriDrag::uriToLocalFile( items[0] ).stripWhiteSpace() ); + QUrl url( items[0] ); + LoadInput( url.toLocalFile().stripWhiteSpace() ); m_parent->setActiveWindow(); return; } @@ -1589,7 +1577,10 @@ QStringList fnames; for ( unsigned int i=0; i<items.size(); ++i ) - fnames.push_back( QUriDrag::uriToLocalFile( items[i] ).stripWhiteSpace() ); + { + QUrl url( items[i] ); + fnames.push_back( url.toLocalFile().stripWhiteSpace() ); + } m_parent->setActiveWindow(); LoadInput( fnames ); Modified: cinesuite/cineplay-cinecode/trunk/src/Download.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Download.cpp 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/Download.cpp 2008-08-25 10:18:02 UTC (rev 185) @@ -128,7 +128,7 @@ #include "Download.moc" Download::Download( QWidget* parent ) - : QObject( parent ), + : QWidget( parent ), impl_( new DownloadImpl(parent) ) { connect( impl_, SIGNAL( done( const QString& ) ), this, SIGNAL( done( const QString& ) ) ); Modified: cinesuite/cineplay-cinecode/trunk/src/Download.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Download.h 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/Download.h 2008-08-25 10:18:02 UTC (rev 185) @@ -22,12 +22,12 @@ #pragma once // qt -#include <QObject> +#include <QWidget> class QString; class QUrl; -class Download : public QObject +class Download : public QWidget { Q_OBJECT Modified: cinesuite/cineplay-cinecode/trunk/src/EncodeTrayEntry.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/EncodeTrayEntry.cpp 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/EncodeTrayEntry.cpp 2008-08-25 10:18:02 UTC (rev 185) @@ -26,15 +26,14 @@ #include "progress.h" #include "EncodeJob.h" -#include <qlayout.h> -#include <qlabel.h> -#include <qfileinfo.h> -#include <qdir.h> -#include <qobject.h> -#include <qapplication.h> -//Added by qt3to4: -#include <QCustomEvent> +#include <QLayout> +#include <QLabel> +#include <QFileInfo> +#include <QDir> +#include <QObject> +#include <QApplication> + enum State { Grey = 0, Yellow, @@ -47,10 +46,10 @@ bool show[4] = {false, false, false, false}; show[(int)s] = true; - e->status_indicator_grey->setShown( show[0] ); - e->status_indicator_yellow->setShown( show[1] ); - e->status_indicator_red->setShown( show[2] ); - e->status_indicator_green->setShown( show[3] ); + e->ui.status_indicator_grey->setShown( show[0] ); + e->ui.status_indicator_yellow->setShown( show[1] ); + e->ui.status_indicator_red->setShown( show[2] ); + e->ui.status_indicator_green->setShown( show[3] ); } // custom events @@ -92,7 +91,7 @@ void execute() { SetState( m_entry, Red ); - m_entry->top_button->setEnabled( false ); + m_entry->ui.top_button->setEnabled( false ); m_entry->setFinished(); } }; @@ -106,10 +105,10 @@ void execute() { - m_entry->top_label->setText( "complete" ); - m_entry->bottom_label->setText( "remove" ); + m_entry->ui.top_label->setText( "complete" ); + m_entry->ui.bottom_label->setText( "remove" ); m_entry->progress->wrapped_setProgress( 100.0 ); - m_entry->top_button->setEnabled( false ); + m_entry->ui.top_button->setEnabled( false ); SetState( m_entry, Green ); m_entry->setFinished(); } @@ -126,7 +125,7 @@ void execute() { - m_entry->top_button->setEnabled( false ); + m_entry->ui.top_button->setEnabled( false ); m_entry->setFinished(); } }; @@ -182,28 +181,30 @@ EncodeTrayEntry::EncodeTrayEntry( QWidget* parent, cineplay::EncodeJob* job ) - : encode_tray_entry( parent ), + : QWidget( parent ), m_job( job ), m_finished( false ) { + ui.setupUi( this ); + m_job->SetCallback( new TrayCallbackDelegate( this ) ); // initialize widgets progress->wrapped_setTotal(100.0); - top_button->local_setOn( false ); - top_button->setProperty( "on", true ); + ui.top_button->local_setOn( false ); + ui.top_button->setProperty( "on", true ); - connect( top_button, SIGNAL( clicked() ), this, SLOT( onPlayPause() ) ); - connect( bottom_button, SIGNAL( clicked() ), this, SLOT( onCancel() ) ); + connect( ui.top_button, SIGNAL( clicked() ), this, SLOT( onPlayPause() ) ); + connect( ui.bottom_button, SIGNAL( clicked() ), this, SLOT( onCancel() ) ); - top_button->setEnabled(true); + ui.top_button->setEnabled(true); SetState( this, Yellow ); QFileInfo finfo( job->GetInputFilename() ); name_label->setText( finfo.baseName( true ) ); size_label->setText( "desktop" ); - bottom_label->setText( "cancel" ); + ui.bottom_label->setText( "cancel" ); } bool EncodeTrayEntry::isFinished() const @@ -218,18 +219,18 @@ void EncodeTrayEntry::onPlayPause() { - bool running = !top_button->property("on").toBool(); + bool running = !ui.top_button->property("on").toBool(); if( running ) { m_job->Pause(); - top_label->setText( "resume" ); + ui.top_label->setText( "resume" ); SetState( this, Grey ); } else { m_job->Resume(); - top_label->setText( "pause" ); + ui.top_label->setText( "pause" ); SetState( this, Yellow ); } } Modified: cinesuite/cineplay-cinecode/trunk/src/EncodeTrayEntry.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/EncodeTrayEntry.h 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/EncodeTrayEntry.h 2008-08-25 10:18:02 UTC (rev 185) @@ -20,21 +20,26 @@ #pragma once -// generated -#include "windows/encode_tray_entry.h" -//Added by qt3to4: +// qt +#include <QWidget> #include <QCustomEvent> +// generated +#include "ui_encode_tray_entry.h" + + class EncodeCustomEvent; namespace cineplay { class EncodeJob; } -class EncodeTrayEntry : public encode_tray_entry +class EncodeTrayEntry : public QWidget { Q_OBJECT public: + Ui::encode_tray_entry ui; + EncodeTrayEntry( QWidget* parent, cineplay::EncodeJob* ); bool isFinished() const; void setFinished(); Modified: cinesuite/cineplay-cinecode/trunk/src/FavoriteTrayEntry.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/FavoriteTrayEntry.cpp 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/FavoriteTrayEntry.cpp 2008-08-25 10:18:02 UTC (rev 185) @@ -20,28 +20,27 @@ #include "FavoriteTrayEntry.h" -// widgets -#include "pushbutton.h" - // qt -#include <qlabel.h> -#include <qframe.h> -#include <qimage.h> -#include <qpixmap.h> -#include <qtooltip.h> +#include <QLabel> +#include <QFrame> +#include <QImage> +#include <QPixmap> +#include <QToolTip> FavoriteTrayEntry::FavoriteTrayEntry( QWidget* parent, - int id, - const QString& name, - const QString& location, - const QImage& thumb ) - : favorite_tray_entry( parent ), + int id, + const QString& name, + const QString& location, + const QImage& thumb ) + : QWidget( parent ), id_( id ) { + ui.setupUi( this ); + if ( !thumb.isNull() && thumb.size() != QSize() ) - image->setPixmap( QPixmap( thumb ) ); - name_label->setText( name ); - connect( bottom_button, SIGNAL( clicked() ), this, SLOT( onRemoveClicked() ) ); + ui.image->setPixmap( QPixmap( thumb ) ); + ui.name_label->setText( name ); + connect( ui.bottom_button, SIGNAL( clicked() ), this, SLOT( onRemoveClicked() ) ); QToolTip::add( this, location ); } Modified: cinesuite/cineplay-cinecode/trunk/src/FavoriteTrayEntry.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/FavoriteTrayEntry.h 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/FavoriteTrayEntry.h 2008-08-25 10:18:02 UTC (rev 185) @@ -20,13 +20,13 @@ #pragma once +// qt +#include <QWidget> + // generated -#include "windows/favorite_tray_entry.h" +#include "ui_favorite_tray_entry.h" -class QString; -class QImage; - -class FavoriteTrayEntry : public favorite_tray_entry +class FavoriteTrayEntry : public QWidget { Q_OBJECT @@ -49,4 +49,5 @@ private: int id_; + Ui::favorite_tray_entry ui; }; Modified: cinesuite/cineplay-cinecode/trunk/src/Jah.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Jah.h 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/Jah.h 2008-08-25 10:18:02 UTC (rev 185) @@ -28,7 +28,11 @@ #include "sdl_store.hpp" #include "opengl_store.hpp" +namespace jahwidgets { namespace qt3 {} } +namespace jahwidgets { namespace qt4 {} } + namespace jw = jahwidgets::qt3; +namespace jw4 = jahwidgets::qt4; namespace ml = olib::openmedialib::ml; namespace il = olib::openimagelib::il; namespace pl = olib::openpluginlib; Modified: cinesuite/cineplay-cinecode/trunk/src/LogMessageHandler.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/LogMessageHandler.h 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/LogMessageHandler.h 2008-08-25 10:18:02 UTC (rev 185) @@ -19,7 +19,7 @@ // For more information, see http://www.audiotube.com // qt -#include <qt.h> +#include <QtGlobal> // log #include "log.h" Modified: cinesuite/cineplay-cinecode/trunk/src/OpenGLStore.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/OpenGLStore.cpp 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/OpenGLStore.cpp 2008-08-25 10:18:02 UTC (rev 185) @@ -751,7 +751,8 @@ bool GLStore::supported() const { //we need a temporary gl context for finding extensions with: - QGLWidget *w = new QGLWidget(0, 0, 0, Qt::WStyle_Customize | Qt::WStyle_NoBorder); + QGLWidget *w = new QGLWidget; + w->setWindowFlags( Qt::FramelessWindowHint ); w->setGeometry(0, 0, 1, 1); w->show(); Modified: cinesuite/cineplay-cinecode/trunk/src/ReleaseDlg.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/ReleaseDlg.cpp 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/ReleaseDlg.cpp 2008-08-25 10:18:02 UTC (rev 185) @@ -31,7 +31,7 @@ #include <qfileinfo.h> // ui -#include "windows/releaseDialog.h" +#include "ui_releaseDialog.h" class ReleaseDlg::ReleaseDlgImpl : public QObject @@ -39,27 +39,28 @@ Q_OBJECT public: - releaseDialog *dialog; + Ui::releaseDialog ui; SkinDialog *skinDlg; bool upchk; bool redirect; ReleaseDlgImpl( QWidget* parent ) { - dialog = new releaseDialog; + QWidget* w = new QWidget; + ui.setupUi( w ); skinDlg = new SkinDialog(parent); - skinDlg->SetContentWidget(dialog); + skinDlg->SetContentWidget( w ); - connect( dialog->ok, SIGNAL( clicked() ), + connect( ui.ok, SIGNAL( clicked() ), this, SLOT( onStart() ) ); - connect( dialog->cancel, SIGNAL( clicked() ), + connect( ui.cancel, SIGNAL( clicked() ), this, SLOT( onCancel() ) ); - connect( dialog->chkupdate, SIGNAL( clicked() ), + connect( ui.chkupdate, SIGNAL( clicked() ), this, SLOT( onCheckbox() ) ); - dialog->ok->setEnabled( true ); - dialog->cancel->setEnabled( true ); - dialog->chkupdate->setEnabled( true ); + ui.ok->setEnabled( true ); + ui.cancel->setEnabled( true ); + ui.chkupdate->setEnabled( true ); } ~ReleaseDlgImpl() @@ -71,15 +72,15 @@ redirect = Upgrade; if ( !Upgrade ) { - dialog->message->setText( tr( "This version (%1) is up to date" ).arg( Version ) ); - dialog->cancel->hide(); + ui.message->setText( tr( "This version (%1) is up to date" ).arg( Version ) ); + ui.cancel->hide(); } else { #ifdef BUILD_CINECODE - dialog->message->setText( "An update for CineCode is available, do you wish to check out?" ); + ui.message->setText( "An update for CineCode is available, do you wish to check out?" ); #else - dialog->message->setText( "An update for CinePlay is available, do you wish to check out?" ); + ui.message->setText( "An update for CinePlay is available, do you wish to check out?" ); #endif //BUILD_CINECODE } } @@ -108,7 +109,7 @@ void onCheckbox() { - if (dialog->chkupdate->isChecked()) + if (ui.chkupdate->isChecked()) upchk = false; else upchk = true; Modified: cinesuite/cineplay-cinecode/trunk/src/RemoveFavouriteDlg.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/RemoveFavouriteDlg.cpp 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/RemoveFavouriteDlg.cpp 2008-08-25 10:18:02 UTC (rev 185) @@ -21,7 +21,9 @@ #include "RemoveFavouriteDlg.h" // qt -#include "qlistview.h" +#include <QTableWidget> +#include <QTableWidgetItem> +#include <QSet> RemoveFavouriteDlg::RemoveFavouriteDlg( QWidget* parent, cineplay::CFavourites* favs ) @@ -33,11 +35,9 @@ SetContentWidget( w ); - ui.favList->setSorting(-1); - unsigned int count = m_favList->getEntryCount(); - //populate the listbox + //populate the table for(int t=count-1; t>=0; t--) { QString frameString; @@ -45,32 +45,31 @@ if(num != -1) frameString = QString::number(num); - (void) new QListViewItem( ui.favList, m_favList->getName(t), frameString, m_favList->getUrl(t)); + QTableWidgetItem* name = new QTableWidgetItem( m_favList->getName(t) ); + QTableWidgetItem* frame = new QTableWidgetItem( frameString ); + QTableWidgetItem* url = new QTableWidgetItem( m_favList->getUrl(t) ); + + ui.favList->setItem( t, 0, name ); + ui.favList->setItem( t, 1, frame ); + ui.favList->setItem( t, 2, url ); } - ConnectCtrlButton("Delete", true); + ConnectCtrlButton( tr( "Delete" ), true); } void RemoveFavouriteDlg::accept() { - QListViewItem *sel = ui.favList->selectedItem(); - - if(sel) + QList< QTableWidgetItem* > selected = ui.favList->selectedItems(); + + if ( !selected.isEmpty() ) { - QListViewItem *ptr = ui.favList->firstChild(); - int counter = 0; + QSet< int > s; + foreach( QTableWidgetItem* item, selected ) + s.insert( item->row() ); - while(ptr) - { - if(ptr == sel) - { - m_favList->removeEntry(counter); - } - - ++counter; - ptr = ptr->nextSibling(); - } + foreach ( int r, s ) + ui.favList->removeRow( r ); } SkinDialog::accept(); Modified: cinesuite/cineplay-cinecode/trunk/src/RemoveFavouriteDlg.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/RemoveFavouriteDlg.h 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/RemoveFavouriteDlg.h 2008-08-25 10:18:02 UTC (rev 185) @@ -37,5 +37,5 @@ public: RemoveFavouriteDlg( QWidget *parent, cineplay::CFavourites *favs ); - void accept(); + void accept(); }; Modified: cinesuite/cineplay-cinecode/trunk/src/ScrollViewResizer.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/ScrollViewResizer.cpp 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/ScrollViewResizer.cpp 2008-08-25 10:18:02 UTC (rev 185) @@ -23,7 +23,8 @@ #include "ScrollViewResizer.h" // qt -#include <qwidget.h> +#include <QWidget> +#include <QEvent> ScrollViewResizer::ScrollViewResizer( QWidget* item, QWidget* viewport, int flags ) : QObject( item ), Modified: cinesuite/cineplay-cinecode/trunk/src/SkinDlg.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/SkinDlg.cpp 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/SkinDlg.cpp 2008-08-25 10:18:02 UTC (rev 185) @@ -27,8 +27,8 @@ #include <QObjectList> #include <QLayout> #include <QCursor> +#include <QMouseEvent> - SkinDialog::SkinDialog( QWidget* parent ) : QDialog( parent ) { @@ -121,7 +121,7 @@ m_resizingApp = true; m_dragClickPos = pt; m_dragAppSize = size(); - setCursor(QCursor::sizeFDiagCursor); + setCursor( Qt::sizeFDiagCursor ); } } } @@ -139,7 +139,7 @@ m_draggingApp = false; m_resizingApp = false; - setCursor(QCursor::arrowCursor); + setCursor( Qt::arrowCursor ); } @@ -161,9 +161,9 @@ QPoint pt = event->pos(); if(m_allowResize && IsResizePos(pt)) - setCursor(QCursor::sizeFDiagCursor); + setCursor( Qt::sizeFDiagCursor ); else - setCursor(QCursor::arrowCursor); + setCursor( Qt::arrowCursor ); } } @@ -199,7 +199,7 @@ x = 2; } - return styledlg::event(e); + return QDialog::event(e); } Deleted: cinesuite/cineplay-cinecode/trunk/src/Theme.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Theme.cpp 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/Theme.cpp 2008-08-25 10:18:02 UTC (rev 185) @@ -1,151 +0,0 @@ -/* -*- mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */ - -// This file is part of Cineplay -// -// Cineplay is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// Cineplay is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. -// -// Copyright (C) 2008 Audiotube Ltd. -// For more information, see http://www.audiotube.com - - -#include <qpushbutton.h> -#include <qscrollbar.h> -#include <qpainter.h> - -#include "Theme.h" - -#if _MSC_VER -# pragma warning ( push ) -# pragma warning ( disable:4065 ) -#endif - -namespace cineplay -{ -#if defined( Q_OS_MACX ) -#define SUPER QMacStyle -#else -#define SUPER QWindowsStyle -#endif - - Theme::Theme() - { - } - - void Theme::drawPrimitive( PrimitiveElement pe, - QPainter *p, - const QRect &r, - const QColorGroup &cg, - SFlags flags, const QStyleOption& opt ) const - { - switch ( pe ) - { -#if !defined(Q_OS_MACX) - case PE_PanelLineEdit: - { - static QColor border( "#525252" ); - p->setPen( border ); - p->drawRect( r ); - break; - } -#endif - - default: - SUPER::drawPrimitive( pe, p, r, cg, flags, opt ); - break; - } - } - - void Theme::drawControl( ControlElement element, - QPainter *p, - const QWidget *w, - const QRect &r, - const QColorGroup &cg, - SFlags flags, - const QStyleOption& opt ) const - { - switch ( element ) - { - case CE_PushButton: - { - // If it has a pixmap then draw that and nothing else... - const QButton* button = dynamic_cast<const QButton*>(w); - if ( button->pixmap() ) { - const QPixmap* pxm = button->pixmap(); - QPoint pt( r.center().x() - pxm->width() / 2, r.center().y() - pxm->height() / 2 ); - p->drawPixmap( pt.x(), pt.y(), *pxm ); - break; - } - } - - case CE_PushButtonLabel: - { - const QButton* button = dynamic_cast<const QButton*>(w); - if ( button->pixmap() ) { - // We've already drawn it... - break; - } - } - - default: - SUPER::drawControl( element, p, w, r, cg, flags, opt ); - break; - } - } - - int Theme::styleHint( StyleHint sh, - const QWidget* w, - const QStyleOption& so, - QStyleHintReturn* shr ) const - { - switch( sh ) - { - /* - case SH_ScrollBar_StopMouseOverSlider: - return 1; - break; - */ - - default: - return SUPER::styleHint( sh, w, so, shr ); - } - } - - int Theme::pixelMetric( PixelMetric metric, const QWidget *w ) const - { - switch( metric ) - { - /* - case PM_ScrollBarExtent: - return 14; - */ - - default: - return SUPER::pixelMetric( metric, w ); - } - } - -#if !defined( Q_OS_MACX ) && !defined( Q_OS_WIN32 ) - - void Theme::polishPopupMenu( QPopupMenu* m ) - { - SUPER::polishPopupMenu( m ); - } - -#endif - -} - -#if _MSC_VER -# pragma warning ( pop ) -#endif Deleted: cinesuite/cineplay-cinecode/trunk/src/Theme.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Theme.h 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/Theme.h 2008-08-25 10:18:02 UTC (rev 185) @@ -1,78 +0,0 @@ -/* -*- mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */ - -// This file is part of Cineplay -// -// Cineplay is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// Cineplay is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. -// -// Copyright (C) 2008 Audiotube Ltd. -// For more information, see http://www.audiotube.com - - -#ifndef CINEPLAY_THEME_H -#define CINEPLAY_THEME_H - -#include <qglobal.h> - -#if defined( Q_OS_MACX ) -#include <qmacstyle_mac.h> -//#elif defined( Q_OS_WIN32 ) -#else -#include <qwindowsstyle.h> -//#else -//#include <qcommonstyle.h> -#endif - -namespace cineplay -{ - // A theme for cinecode based on the platform's theme - class Theme : -#if defined( Q_OS_MACX ) - public QMacStyle -// #elif defined( Q_OS_WIN32 ) -#else - public QWindowsStyle -// #else -// public QCommonStyle -#endif - { - public: - Theme(); - - void drawPrimitive( PrimitiveElement pe, - QPainter *p, - const QRect &r, - const QColorGroup &cg, - SFlags flags = Style_Default, - const QStyleOption& = QStyleOption::Default ) const; - - void drawControl( ControlElement element, - QPainter *p, - const QWidget *widget, - const QRect &r, - const QColorGroup &cg, - SFlags how = Style_Default, - const QStyleOption& = QStyleOption::Default ) const; - - virtual int styleHint( StyleHint sh, const QWidget* w, const QStyleOption&, QStyleHintReturn* ) const; - - virtual int pixelMetric( PixelMetric, const QWidget * ) const; - -#if !defined( Q_OS_MACX ) && !defined( Q_OS_WIN32 ) - virtual void polishPopupMenu( QPopupMenu* ); -#endif - - }; -} - -#endif Modified: cinesuite/cineplay-cinecode/trunk/src/Tray.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Tray.cpp 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/Tray.cpp 2008-08-25 10:18:02 UTC (rev 185) @@ -21,11 +21,11 @@ #include "Tray.h" // qt -#include <qframe.h> -#include <qdesktopwidget.h> -#include <qrect.h> -#include <qpoint.h> -#include <qdatastream.h> +#include <QFrame> +#include <QDesktopWidget> +#include <QRect> +#include <QPoint> +#include <QDataStream> const static int INSET = 10; @@ -34,25 +34,25 @@ location_( location ), dimension_( width ) { - setWidgetAttributes( Qt::WStyle_Tool | Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WType_TopLevel ); + setWindowFlags( Qt::WStyle_Tool | Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WType_TopLevel ); ui.setupUi( this ); switch ( location_ ) { case LOCATION_TOP: - bottom->hide(); + ui.bottom->hide(); break; case LOCATION_BOTTOM: - top->hide(); + ui.top->hide(); break; case LOCATION_LEFT: - right_vertical->hide(); + ui.right_vertical->hide(); break; default: - left_vertical->hide(); + ui.left_vertical->hide(); break; } @@ -61,7 +61,7 @@ QWidget* Tray::placeholder() const { - return tray::placeholder; + return ui.placeholder; } Tray::Location Tray::location() const Modified: cinesuite/cineplay-cinecode/trunk/src/Utils.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Utils.cpp 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/Utils.cpp 2008-08-25 10:18:02 UTC (rev 185) @@ -25,13 +25,12 @@ #include "log.h" // qt -#include <qdir.h> -#include <qlayout.h> -#include <qwidget.h> -#include <qobject.h> -#include <qobjectlist.h> -#include <qcstring.h> -#include <qbuffer.h> +#include <QDir> +#include <QLayout> +#include <QWidget> +#include <QObject> +#include <QByteArray> +#include <QBuffer> // std #include <memory> @@ -209,10 +208,10 @@ if( !parent ) return NULL; - std::auto_ptr< QObjectList > objList( parent->queryList( NULL, name, false /* no regexp */ ) ); + QList< QWidget* > objList = parent->findChildren< QWidget* >( name ); QWidget* result = NULL; - if ( !objList->isEmpty() ) - result = dynamic_cast< QWidget* >( objList->first() ); + if ( !objList.isEmpty() ) + result = objList.first(); { DEBUG_LOG << "result: " << result; @@ -320,7 +319,7 @@ { int w = qimage.width( ); int h = qimage.height( ); - uchar *bits = qimage.bits( ); + const uchar* bits = qimage.bits( ); // Optimal memcpy when applicable il::image_type_ptr image; @@ -412,8 +411,8 @@ DEBUG_LOG; QByteArray bytes; - QBuffer buf( bytes ); - buf.open( IO_ReadWrite ); + QBuffer buf( &bytes ); + buf.open( QIODevice::ReadWrite ); im.save( &buf, "PNG" ); return QByteArrayToString( bytes ); @@ -432,53 +431,13 @@ QString QByteArrayToString( const QByteArray& bytes ) { DEBUG_LOG; - - QString result; - - static const char* static_map[] = { "0", "1", "2", "3", "4", "5", "6", "7", - "8", "9", "a", "b", "c", "d", "e", "f" }; - - for ( unsigned int i=0; i<bytes.size(); ++i ) - { - result.append( static_map[ static_cast< unsigned char >( bytes.at(i) )/16 ] ); - result.append( static_map[ static_cast< unsigned char >( bytes.at(i) )%16 ] ); - } - - return result; + return QString( bytes.toHex() ); } QByteArray StringToQByteArray( const QString& s ) { DEBUG_LOG; - - static std::map< char, int > static_map; - if ( static_map.empty() ) - { - static_map[ '0' ] = 0; - static_map[ '1' ] = 1; - static_map[ '2' ] = 2; - static_map[ '3' ] = 3; - static_map[ '4' ] = 4; - static_map[ '5' ] = 5; - static_map[ '6' ] = 6; - static_map[ '7' ] = 7; - static_map[ '8' ] = 8; - static_map[ '9' ] = 9; - static_map[ 'a' ] = 10; - static_map[ 'b' ] = 11; - static_map[ 'c' ] = 12; - static_map[ 'd' ] = 13; - static_map[ 'e' ] = 14; - static_map[ 'f' ] = 15; - } - - QByteArray bytes( s.length()/2 ); - for ( unsigned int i=0; i<bytes.size(); ++i ) - { - bytes.at(i) = static_map[ s.at(2*i) ]*16 + static_map[ s.at(2*i+1) ]; - } - - return bytes; + return QByteArray::fromHex( s.toLatin1() ); } Added: cinesuite/cineplay-cinecode/trunk/src/about.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/about.cpp (rev 0) +++ cinesuite/cineplay-cinecode/trunk/src/about.cpp 2008-08-25 10:18:02 UTC (rev 185) @@ -0,0 +1,61 @@ +/* -*- mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */ + +// This file is part of Cineplay +// +// Cineplay is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// Cineplay is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +// +// Copyright (C) 2008 Audiotube Ltd. +// For more information, see http://www.audiotube.com + +#include "about.h" + +// local +#include "SkinDlg.h" +#include "Version.h" + +// generated +#ifdef BUILD_CINECODE +#include "ui_about_cinecode.h" +#else +#include "ui_about.h" +#endif + +class AboutDialog::AboutDialogPrivate : public QObject +{ +public: + SkinDialog *skinDlg; + Ui::AboutDialog ui; + + AboutDialogPrivate( QWidget *parent ) + { + skinDlg = new SkinDialog( parent ); + QWidget* w = new QWidget( skinDlg ); + ui.setupUi( w ); + skinDlg->SetContentWidget( w ); + skinDlg->SetAllowResize(false); + + QString versionString = tr( "Version: %1" ).arg( CINE_VERSION ); + ui.versionLabel->setText( versionString ); + } +}; + +AboutDialog::AboutDialog( QWidget* parent ) + : QWidget( parent ), + impl_( new AboutDialogPrivate(parent) ) +{} + +int AboutDialog::exec() +{ + return impl_->skinDlg->exec(); +} Added: cinesuite/cineplay-cinecode/trunk/src/about.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/about.h (rev 0) +++ cinesuite/cineplay-cinecode/trunk/src/about.h 2008-08-25 10:18:02 UTC (rev 185) @@ -0,0 +1,37 @@ +/* -*- mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */ + +// This file is part of Cineplay +// +// Cineplay is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// Cineplay is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +// +// Copyright (C) 2008 Audiotube Ltd. +// For more information, see http://www.audiotube.com + +#pragma once + +// qt +#include <QWidget> + + +class AboutDialog : public QWidget +{ +public: + AboutDialog( QWidget* parent = NULL ); + + int exec(); + +private: + class AboutDialogPrivate; + AboutDialogPrivate* impl_; +}; Modified: cinesuite/cineplay-cinecode/trunk/src/common.pri =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/common.pri 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/common.pri 2008-08-25 10:18:02 UTC (rev 185) @@ -40,7 +40,6 @@ RemoveFavouriteDlg.h \ SetupDefs.h \ SkinDlg.h \ - Theme.h \ Version.h \ Utils.h \ Command.h \ @@ -52,7 +51,8 @@ ScrollViewResizer.h \ GridLayoutCallback.h \ Geometry.hpp \ - Lerp.hpp + Lerp.hpp \ + about.h SOURCES += \ AddFavouriteDlg.cpp \ @@ -68,7 +68,6 @@ ReleaseDlg.cpp \ RemoveFavouriteDlg.cpp \ SkinDlg.cpp \ - Theme.cpp \ Utils.cpp \ Command.cpp \ Tray.cpp \ @@ -77,4 +76,5 @@ PlayerMultiplexer.cpp \ ScrollViewResizer.cpp \ GridLayoutCallback.cpp \ - Geometry.cpp + Geometry.cpp \ + about.cpp Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/progress.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/widgets/progress.h 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/widgets/progress.h 2008-08-25 10:18:02 UTC (rev 185) @@ -11,9 +11,9 @@ // qt #include "config.h" -#include <qprogressbar.h> +#include <QProgressBar> -namespace jahwidgets { namespace qt3 { +namespace jahwidgets { namespace qt4 { #define TOTAL 100 @@ -24,15 +24,18 @@ Q_PROPERTY( double total READ wrapped_total WRITE wrapped_setTotal ) public: - Progress( QWidget* parent, const char* name = 0 ) - : QProgressBar( TOTAL, parent, name ), + Progress( QWidget* parent ) + : QProgressBar( parent ), m_total( 1 ) - {} + { + setMaximum( TOTAL ); + setMinimum( 0 ); + } - double wrapped_progress() const { return progress() * m_total / TOTAL; } + double wrapped_progress() const { return value() * m_total / TOTAL; } void wrapped_setProgress( double v ) { - setProgress( (int)( v * TOTAL / m_total ) ); + setValue( (int)( v * TOTAL / m_total ) ); } double wrapped_total() const { return m_total; } void wrapped_setTotal( double v ) Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/widgetStack.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/widgets/widgetStack.cpp 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/widgets/widgetStack.cpp 2008-08-25 10:18:02 UTC (rev 185) @@ -12,7 +12,7 @@ // std #include <algorithm> -namespace jahwidgets { namespace qt3 { +namespace jahwidgets { namespace qt4 { WidgetStack::WidgetStack( QWidget* parent, const char* name ) : QFrame( parent, name ) Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/widgetStack.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/widgets/widgetStack.h 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/widgets/widgetStack.h 2008-08-25 10:18:02 UTC (rev 185) @@ -15,7 +15,7 @@ #include "config.h" -namespace jahwidgets { namespace qt3 { +namespace jahwidgets { namespace qt4 { class WIDGETS_DECLSPEC WidgetStack : public QFrame { Modified: cinesuite/cineplay-cinecode/trunk/src/windows/about.ui =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/windows/about.ui 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/windows/about.ui 2008-08-25 10:18:02 UTC (rev 185) @@ -3,7 +3,7 @@ <comment></comment> <exportmacro></exportmacro> <class>AboutDialog</class> - <widget class="QDialog" name="AboutDialog" > + <widget class="QWidget" name="AboutDialog" > <property name="geometry" > <rect> <x>0</x> @@ -38,12 +38,6 @@ <property name="windowIcon" > <pixmap>image0</pixmap> </property> - <property name="sizeGripEnabled" > - <bool>false</bool> - </property> - <property name="modal" > - <bool>true</bool> - </property> <layout class="QVBoxLayout" > <property name="margin" > <number>0</number> Modified: cinesuite/cineplay-cinecode/trunk/src/windows/about_cinecode.ui =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/windows/about_cinecode.ui 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/windows/about_cinecode.ui 2008-08-25 10:18:02 UTC (rev 185) @@ -3,7 +3,7 @@ <comment></comment> <exportmacro></exportmacro> <class>AboutDialog</class> - <widget class="QDialog" name="AboutDialog" > + <widget class="QWidget" name="AboutDialog" > <property name="geometry" > <rect> <x>0</x> @@ -38,12 +38,6 @@ <property name="windowIcon" > <pixmap>image0</pixmap> </property> - <property name="sizeGripEnabled" > - <bool>false</bool> - </property> - <property name="modal" > - <bool>true</bool> - </property> <layout class="QVBoxLayout" > <property name="margin" > <number>0</number> Modified: cinesuite/cineplay-cinecode/trunk/src/windows/encode_tray_entry.ui =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/windows/encode_tray_entry.ui 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/windows/encode_tray_entry.ui 2008-08-25 10:18:02 UTC (rev 185) @@ -260,7 +260,7 @@ </layout> </item> <item rowspan="1" row="2" column="2" colspan="2" > - <widget class="jahwidgets::qt3::WidgetStack" name="stack" > + <widget class="jahwidgets::qt4::WidgetStack" name="stack" > <property name="sizePolicy" > <sizepolicy> <hsizetype>5</hsizetype> @@ -301,7 +301,7 @@ <number>0</number> </property> <item> - <widget class="jahwidgets::qt3::Progress" name="progress" /> + <widget class="jahwidgets::qt4::Progress" name="progress" /> </item> </layout> </widget> @@ -422,21 +422,6 @@ <property name="flat" > <bool>true</bool> </property> - <property name="activeOnIcon" > - <pixmap>image6</pixmap> - </property> - <property name="normalOnIcon" > - <pixmap>image7</pixmap> - </property> - <property name="disabledOnIcon" > - <pixmap>image7</pixmap> - </property> - <property name="activeOffIcon" > - <pixmap>image8</pixmap> - </property> - <property name="normalOffIcon" > - <pixmap>image5</pixmap> - </property> </widget> </item> <item row="0" column="1" > @@ -510,18 +495,6 @@ <property name="flat" > <bool>true</bool> </property> - <property name="activeOnIcon" > - <pixmap>image10</pixmap> - </property> - <property name="normalOnIcon" > - <pixmap>image9</pixmap> - </property> - <property name="activeOffIcon" > - <pixmap>image10</pixmap> - </property> - <property name="normalOffIcon" > - <pixmap>image9</pixmap> - </property> </widget> </item> </layout> Modified: cinesuite/cineplay-cinecode/trunk/src/windows/favorite_tray_entry.ui =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/windows/favorite_tray_entry.ui 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/windows/favorite_tray_entry.ui 2008-08-25 10:18:02 UTC (rev 185) @@ -143,18 +143,6 @@ <property name="flat" > <bool>true</bool> </property> - <property name="activeOnIcon" > - <pixmap>image2</pixmap> - </property> - <property name="normalOnIcon" > - <pixmap>image1</pixmap> - </property> - <property name="activeOffIcon" > - <pixmap>image2</pixmap> - </property> - <property name="normalOffIcon" > - <pixmap>image1</pixmap> - </property> </widget> </item> <item> Modified: cinesuite/cineplay-cinecode/trunk/src/windows/main_cinecode.ui =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/windows/main_cinecode.ui 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/windows/main_cinecode.ui 2008-08-25 10:18:02 UTC (rev 185) @@ -214,9 +214,6 @@ <property name="focusPolicy" > <enum>Qt::NoFocus</enum> </property> - <property name="autoMask" > - <bool>true</bool> - </property> <property name="text" > <string/> </property> @@ -226,21 +223,6 @@ <property name="flat" > <bool>true</bool> </property> - <property name="activeOnIcon" > - <pixmap>image5</pixmap> - </property> - <property name="normalOnIcon" > - <pixmap>image5</pixmap> - </property> - <property name="disabledOnIcon" > - <pixmap>image5</pixmap> - </property> - <property name="activeOffIcon" > - <pixmap>image5</pixmap> - </property> - <property name="normalOffIcon" > - <pixmap>image4</pixmap> - </property> </widget> </item> <item> @@ -268,9 +250,6 @@ <property name="focusPolicy" > <enum>Qt::NoFocus</enum> </property> - <property name="autoMask" > - <bool>true</bool> - </property> <property name="text" > <string/> </property> @@ -280,18 +259,6 @@ <property name="flat" > <bool>true</bool> </property> - <property name="activeOnIcon" > - <pixmap>image7</pixmap> - </property> - <property name="normalOnIcon" > - <pixmap>image7</pixmap> - </property> - <property name="activeOffIcon" > - <pixmap>image7</pixmap> - </property> - <property name="normalOffIcon" > - <pixmap>image6</pixmap> - </property> </widget> </item> <item> @@ -319,9 +286,6 @@ <property name="focusPolicy" > <enum>Qt::NoFocus</enum> </property> - <property name="autoMask" > - <bool>true</bool> - </property> <property name="text" > <string/> </property> @@ -331,18 +295,6 @@ <property name="flat" > <bool>true</bool> </property> - <property name="activeOnIcon" > - <pixmap>image9</pixmap> - </property> - <property name="normalOnIcon" > - <pixmap>image9</pixmap> - </property> - <property name="activeOffIcon" > - <pixmap>image9</pixmap> - </property> - <property name="normalOffIcon" > - <pixmap>image8</pixmap> - </property> </widget> </item> </layout> @@ -746,18 +698,6 @@ <property name="flat" > <bool>true</bool> </property> - <property name="activeOnIcon" > - <pixmap>image11</pixmap> - </property> - <property name="normalOnIcon" > - <pixmap>image12</pixmap> - </property> - <property name="activeOffIcon" > - <pixmap>image13</pixmap> - </property> - <property name="normalOffIcon" > - <pixmap>image14</pixmap> - </property> </widget> </item> <item> @@ -1057,18 +997,6 @@ <property name="flat" > <bool>true</bool> </property> - <property name="activeOnIcon" > - <pixmap>image13</pixmap> - </property> - <property name="normalOnIcon" > - <pixmap>image14</pixmap> - </property> - <property name="activeOffIcon" > - <pixmap>image11</pixmap> - </property> - <property name="normalOffIcon" > - <pixmap>image12</pixmap> - </property> </widget> </item> </layout> Modified: cinesuite/cineplay-cinecode/trunk/src/windows/releaseDialog.ui =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/windows/releaseDialog.ui 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/windows/releaseDialog.ui 2008-08-25 10:18:02 UTC (rev 185) @@ -3,7 +3,7 @@ <comment></comment> <exportmacro></exportmacro> <class>releaseDialog</class> - <widget class="QDialog" name="releaseDialog" > + <widget class="QWidget" name="releaseDialog" > <property name="geometry" > <rect> <x>0</x> Modified: cinesuite/cineplay-cinecode/trunk/src/windows/removefav.ui =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/windows/removefav.ui 2008-08-21 22:58:48 UTC (rev 184) +++ cinesuite/cineplay-cinecode/trunk/src/windows/removefav.ui 2008-08-25 10:18:02 UTC (rev 185) @@ -34,16 +34,10 @@ </property> <layout class="QHBoxLayout" > <item> - <widget class="Q3ListView" name="favList" > + <widget class="QTableWidget" name="favList" > <property name="lineWidth" > <number>1</number> </property> - <property name="margin" > - <number>0</number> - </property> - <property name="itemMargin" > - <number>4</number> - </property> <column> <property name="text" > <string>Name</string> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-08-25 23:24:42
|
Revision: 186 http://editopia.svn.sourceforge.net/editopia/?rev=186&view=rev Author: timdewhirst Date: 2008-08-25 23:24:30 +0000 (Mon, 25 Aug 2008) Log Message: ----------- cinesuite - Qt4 compiles Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp cinesuite/cineplay-cinecode/trunk/src/CineCode.h cinesuite/cineplay-cinecode/trunk/src/Common.cpp cinesuite/cineplay-cinecode/trunk/src/EncodeTrayEntry.cpp cinesuite/cineplay-cinecode/trunk/src/ReleaseDlg.cpp cinesuite/cineplay-cinecode/trunk/src/ReleaseDlg.h cinesuite/cineplay-cinecode/trunk/src/common.pri cinesuite/cineplay-cinecode/trunk/src/windows/filters.ui Removed Paths: ------------- cinesuite/cineplay-cinecode/trunk/src/Browser.cpp cinesuite/cineplay-cinecode/trunk/src/Browser.h Deleted: cinesuite/cineplay-cinecode/trunk/src/Browser.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Browser.cpp 2008-08-25 10:18:02 UTC (rev 185) +++ cinesuite/cineplay-cinecode/trunk/src/Browser.cpp 2008-08-25 23:24:30 UTC (rev 186) @@ -1,166 +0,0 @@ -/* -*- mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */ - -// This file is part of Cineplay -// -// Cineplay is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// Cineplay is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. -// -// Copyright (C) 2008 Audiotube Ltd. -// For more information, see http://www.audiotube.com - -#include "Browser.h" - -// qt -#include <QUrl> -#include <QString> -#include <QStringList> -#include <QByteArray> - -#if defined( Q_OS_MACX ) - -#include <ApplicationServices/ApplicationServices.h> - -bool openBrowserWindow( const QUrl& url ) -{ - // ensure we have a protocol at the front - if ( url.protocol() != "http" && url.protocol() != "file" ) - { - qWarning() << "openBrowserWindow: failed to find known protocol:" << url.protocol(); - return false; - } - - QByteArray utf8Url = url.toString().utf8(); - CFURLRef cfurl = CFURLCreateWithBytes(NULL, - (UInt8*) utf8Url.data(), (SInt32) utf8Url.length(), - kCFStringEncodingUTF8, /* no base URL */ NULL); - - OSStatus err = LSOpenCFURLRef(cfurl, NULL); - if (err != noErr) - { - qWarning() << "LSOpenCFURLRef failed with error:" <<static_cast<int>(err); - return false; - } - - CFRelease(cfurl); - return true; -} - -#elif defined( Q_OS_WIN32 ) - -#include <windows.h> -#include <shellapi.h> - -bool openBrowserWindow( const QUrl& url_ ) -{ - QString action("open"); - QString url( url_ ); - - HINSTANCE status = 0; - QByteArray a = action.local8Bit(); - QByteArray u = url.local8Bit(); - - QT_WA( - { - status = ::ShellExecute( NULL, - (TCHAR*)action.ucs2(), - (TCHAR*)url.ucs2(), - 0, - 0, - SW_SHOW); - }, - { - status = ::ShellExecuteA( NULL, - a, - u, - 0, - 0, - SW_SHOW); - }); - - return status; -} - -#else - -// std -#include <cstdlib> -#include <cerrno> -extern int errno; - -bool openBrowserWindow( const QUrl& url ) -{ - // ensure we have a protocol at the front - if ( url.protocol() != "http" && url.protocol() != "file" ) - { - qWarning() << "openBrowserWindow: failed to find known protocol:" << url.protocol(); - return false; - } - - // try this strategy: - // - if BROWSER is set use it - // - if no BROWSER: - // - try a list of browsers - QString browser = getenv("BROWSER"); - if ( !browser.isEmpty() ) - { - browser += " " + url + " &"; - - if ( system( browser ) != 0 ) - { - qWarning( "browser: failed to open %s, error: %s", browser.ascii(), strerror( errno ) ); - return false; - } - - return true; - } - - QStringList browserList; - browserList << "mozilla" << "firefox" << "netscape" << "opera"; - - for ( QStringList::const_iterator I = browserList.begin(); I != browserList.end(); ++I ) - { - // check to see if the browser is running - int res = system( *I + " -remote \"ping()\"" ); - if ( res == 0 ) - { - // okay, soemthing is running... - // try this natty trick - QString process( *I + " -remote \"openURL(" + url + ", new-tab)\"" ); - res = system( process ); - if ( res == 0 ) - { - return true; - } - - qDebug( "browser: failed to open tab: %s, error: %s", process.ascii(), strerror( errno ) ); - } - else - { - // just try to run the browser - QString process( *I + " " + url + " &" ); - res = system( process ); - if ( res == 0 ) - { - return true; - } - - qWarning( "browser: failed to open app: %s, error: %s", process.ascii(), strerror( errno ) ); - } - } - - return false; -} - -#endif - - Deleted: cinesuite/cineplay-cinecode/trunk/src/Browser.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Browser.h 2008-08-25 10:18:02 UTC (rev 185) +++ cinesuite/cineplay-cinecode/trunk/src/Browser.h 2008-08-25 23:24:30 UTC (rev 186) @@ -1,25 +0,0 @@ -/* -*- mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */ - -// This file is part of Cineplay -// -// Cineplay is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// Cineplay is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. -// -// Copyright (C) 2008 Audiotube Ltd. -// For more information, see http://www.audiotube.com - -#pragma once - -class QUrl; - -bool openBrowserWindow( const QUrl& url ); Modified: cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp 2008-08-25 10:18:02 UTC (rev 185) +++ cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp 2008-08-25 23:24:30 UTC (rev 186) @@ -29,32 +29,30 @@ #include "FavoriteTrayEntry.h" #include "LogMessageHandler.h" #include "log.h" -#include "ui_filters.h" #include "slider.h" #include "timelineSlider.h" #include "ScrollViewResizer.h" // qt -#include <qapplication.h> -#include <q3groupbox.h> -#include <q3network.h> -#include <qmenubar.h> -#include <qmessagebox.h> -#include <qlayout.h> -#include <qobject.h> -#include <q3vbox.h> -#include <qstringlist.h> -#include <qsettings.h> -#include <q3widgetstack.h> +#include <QScrollArea> +#include <QFileInfo> +#include <QApplication> +#include <QGroupBox> +#include <QMenuBar> +#include <QMessageBox> +#include <QLayout> +#include <QObject> +#include <QVBoxLayout> +#include <QStringList> +#include <QSettings> +#include <QStackedWidget> //Added by qt3to4: #include <QKeyEvent> #include <QCustomEvent> -#include <Q3Frame> #include <QDragEnterEvent> #include <QDropEvent> #include <QResizeEvent> -#include <Q3PopupMenu> #include <QMouseEvent> #include <Q3VBoxLayout> @@ -129,44 +127,42 @@ connect( toggleRightTrayButton, SIGNAL( toggled( bool ) ), m_encodeTray, SLOT( setShown( bool ) ) ); // setup a scrollview - Q3VBoxLayout* placeholderLayout = new Q3VBoxLayout( m_encodeTray->placeholder() ); + QVBoxLayout* placeholderLayout = new QVBoxLayout( m_encodeTray->placeholder() ); placeholderLayout->setSpacing( 0 ); placeholderLayout->setMargin( 0 ); // set a widget stack - m_encodeStack = new Q3WidgetStack( m_encodeTray->placeholder() ); + m_encodeStack = new QStackedWidget( m_encodeTray->placeholder() ); placeholderLayout->addWidget( m_encodeStack ); { // create a container widget for encoding - Q3ScrollView* sv = new Q3ScrollView( m_encodeStack ); - sv->setFrameStyle( Q3Frame::NoFrame ); - sv->setHScrollBarMode( Q3ScrollView::AlwaysOff ); - sv->setVScrollBarMode( Q3ScrollView::AlwaysOn ); + QScrollArea* sv = new QScrollArea( m_encodeStack ); + sv->setFrameShape( QFrame::NoFrame ); + sv->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); + sv->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn ); // setup a placeholder m_encodeTrayViewport = sv->viewport(); - m_encodeTrayPlaceholder = new Q3VBox( sv->viewport() ); - sv->addChild( m_encodeTrayPlaceholder ); - m_encodeTrayPlaceholder->layout()->setAutoAdd( true ); + m_encodeTrayPlaceholder = new QWidget( sv->viewport() ); + new QVBoxLayout( m_encodeTrayPlaceholder ); - m_encodeStack->addWidget( sv, ENUM_ENCODE ); + m_encodeStack->insertWidget( ENUM_ENCODE, sv ); } { // create a container widget for favourites - Q3ScrollView* sv = new Q3ScrollView( m_encodeStack ); - sv->setFrameStyle( Q3Frame::NoFrame ); - sv->setHScrollBarMode( Q3ScrollView::AlwaysOff ); - sv->setVScrollBarMode( Q3ScrollView::AlwaysOn ); + QScrollArea* sv = new QScrollArea( m_encodeStack ); + sv->setFrameShape( QFrame::NoFrame ); + sv->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); + sv->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn ); // setup a placeholder m_favouriteTrayViewport = sv->viewport(); - m_favouriteTrayPlaceholder = new Q3VBox( sv->viewport() ); - sv->addChild( m_favouriteTrayPlaceholder ); - m_favouriteTrayPlaceholder->layout()->setAutoAdd( true ); + m_favouriteTrayPlaceholder = new QWidget( sv->viewport() ); + new QVBoxLayout( m_encodeTrayPlaceholder ); - m_encodeStack->addWidget( sv, ENUM_FAVOURITE ); + m_encodeStack->insertWidget( ENUM_FAVOURITE, sv ); } connect( CineUtils::FindWidget( "favorites", m_encodeTray ), SIGNAL( clicked() ), @@ -202,24 +198,25 @@ connect( toggleLeftTrayButton, SIGNAL( toggled( bool ) ), m_effectsTray, SLOT( setShown( bool ) ) ); Q3VBoxLayout* layout = new Q3VBoxLayout( m_effectsTray->placeholder() ); - m_effects = new ui_filters( m_effectsTray->placeholder() ); - layout->addWidget( m_effects ); + QWidget* effectsWidget = new QWidget; + m_effects.setupUi( effectsWidget ); + layout->addWidget( effectsWidget ); // hook up conrols - connect( m_effects->brightness, SIGNAL( valueChanged( int ) ), this, SLOT( onBrightnessChanged( int ) ) ); - connect( m_effects->hue, SIGNAL( valueChanged( int ) ), this, SLOT( onHueChanged( int ) ) ); - connect( m_effects->contrast, SIGNAL( valueChanged( int ) ), this, SLOT( onContrastChanged( int ) ) ); - connect( m_effects->saturation, SIGNAL( valueChanged( int ) ), this, SLOT( onSaturationChanged( int ) ) ); - connect( m_effects->colour_correction, SIGNAL( toggled( bool ) ), this, SLOT( onFiltersEnabled( bool ) ) ); + connect( m_effects.brightness, SIGNAL( valueChanged( int ) ), this, SLOT( onBrightnessChanged( int ) ) ); + connect( m_effects.hue, SIGNAL( valueChanged( int ) ), this, SLOT( onHueChanged( int ) ) ); + connect( m_effects.contrast, SIGNAL( valueChanged( int ) ), this, SLOT( onContrastChanged( int ) ) ); + connect( m_effects.saturation, SIGNAL( valueChanged( int ) ), this, SLOT( onSaturationChanged( int ) ) ); + connect( m_effects.colour_correction, SIGNAL( toggled( bool ) ), this, SLOT( onFiltersEnabled( bool ) ) ); // intialise { QSettings settings; - m_effects->brightness->setValue( settings.readNumEntry( SETTINGS_BRIGHTNESS, 50 ) ); - m_effects->hue->setValue( settings.readNumEntry( SETTINGS_HUE, 50 ) ); - m_effects->contrast->setValue( settings.readNumEntry( SETTINGS_CONTRAST, 50 ) ); - m_effects->saturation->setValue( settings.readNumEntry( SETTINGS_SATURATION, 50 ) ); - m_effects->colour_correction->setChecked( settings.readBoolEntry( SETTINGS_COLOURFILTERENABLED, false ) ); + m_effects.brightness->setValue( settings.readNumEntry( SETTINGS_BRIGHTNESS, 50 ) ); + m_effects.hue->setValue( settings.readNumEntry( SETTINGS_HUE, 50 ) ); + m_effects.contrast->setValue( settings.readNumEntry( SETTINGS_CONTRAST, 50 ) ); + m_effects.saturation->setValue( settings.readNumEntry( SETTINGS_SATURATION, 50 ) ); + m_effects.colour_correction->setChecked( settings.readBoolEntry( SETTINGS_COLOURFILTERENABLED, false ) ); } // disable the encode buttons @@ -248,13 +245,13 @@ { switch( e->key() ) { - case Key_I: + case Qt::Key_I: onSetInPoint(); break; - case Key_O: + case Qt::Key_O: onSetOutPoint(); break; - case Key_R: + case Qt::Key_R: onResetInOutPoints(); break; default: @@ -381,12 +378,13 @@ darker.setColor( QColorGroup::Button, darker.color( QPalette::Normal, QColorGroup::Background ) ); EncodeTrayEntry* w = new EncodeTrayEntry( m_encodeTrayPlaceholder, e ); + m_encodeTrayPlaceholder->layout()->addWidget( w ); new ScrollViewResizer( w, m_encodeTrayViewport, ScrollViewResizer::HORIZONTAL ); QFont f( font() ); f.setPointSizeFloat( SETTINGS_TRAYFONTPERCENT_DEFAULT * f.pointSizeFloat() / 100 ); w->setFont( f ); - if ( m_encodeTrayPlaceholder->children()->count()%2 ) + if ( m_encodeTrayPlaceholder->children().count()%2 ) w->setPalette( darker ); w->show(); @@ -423,24 +421,23 @@ { DEBUG_LOG; - const QObjectList* children = m_encodeTrayPlaceholder->children(); - Q3PtrListIterator< QObject > I( *children ); + QList< QObject* > children = m_encodeTrayPlaceholder->children(); + QList< QObject* >::iterator I = children.begin(); + QList< QObject* >::iterator E = children.end(); typedef std::vector< QObject* > QObjectVector; QObjectVector toRemove; - while( I.current() ) + for( ; I!=E; ++I ) { - EncodeTrayEntry* e = dynamic_cast< EncodeTrayEntry* >( I.current() ); + EncodeTrayEntry* e = dynamic_cast< EncodeTrayEntry* >( *I ); if ( e && e->isFinished() ) toRemove.push_back( e ); - - ++I; } QObjectVector::iterator I_ = toRemove.begin(); - QObjectVector::iterator E = toRemove.end(); - for( ; I_!=E; ++I_ ) + QObjectVector::iterator E_ = toRemove.end(); + for( ; I_!=E_; ++I_ ) (*I_)->deleteLater(); } @@ -545,26 +542,26 @@ { DEBUG_LOG; - jw::Pushbutton* fb = static_cast< jw::Pushbutton* >( CineUtils::FindWidget( "favorites", m_encodeTray ) ); - jw::Pushbutton* eb = static_cast< jw::Pushbutton* >( CineUtils::FindWidget( "encode", m_encodeTray ) ); + QPushButton* fb = static_cast< QPushButton* >( CineUtils::FindWidget( "favorites", m_encodeTray ) ); + QPushButton* eb = static_cast< QPushButton* >( CineUtils::FindWidget( "encode", m_encodeTray ) ); - fb->setOn( false ); - eb->setOn( true ); + fb->setDown( false ); + eb->setDown( true ); - m_encodeStack->raiseWidget( ENUM_ENCODE ); + m_encodeStack->setCurrentIndex( ENUM_ENCODE ); } void CineCode::onShowFavourites() { DEBUG_LOG; - jw::Pushbutton* fb = static_cast< jw::Pushbutton* >( CineUtils::FindWidget( "favorites", m_encodeTray ) ); - jw::Pushbutton* eb = static_cast< jw::Pushbutton* >( CineUtils::FindWidget( "encode", m_encodeTray ) ); + QPushButton* fb = static_cast< QPushButton* >( CineUtils::FindWidget( "favorites", m_encodeTray ) ); + QPushButton* eb = static_cast< QPushButton* >( CineUtils::FindWidget( "encode", m_encodeTray ) ); - fb->setOn( true ); - eb->setOn( false ); + fb->setDown( true ); + eb->setDown( false ); - m_encodeStack->raiseWidget( ENUM_FAVOURITE ); + m_encodeStack->setCurrentIndex( ENUM_FAVOURITE ); } void CineCode::setFilterValue( const char* key, double v ) @@ -581,11 +578,11 @@ void CineCode::storeFilterSettings() { QSettings settings; - settings.writeEntry( SETTINGS_BRIGHTNESS, m_effects->brightness->value() ); - settings.writeEntry( SETTINGS_HUE, m_effects->hue->value() ); - settings.writeEntry( SETTINGS_CONTRAST, m_effects->contrast->value() ); - settings.writeEntry( SETTINGS_SATURATION, m_effects->saturation->value() ); - settings.writeEntry( SETTINGS_COLOURFILTERENABLED, m_effects->colour_correction->isChecked() ); + settings.writeEntry( SETTINGS_BRIGHTNESS, m_effects.brightness->value() ); + settings.writeEntry( SETTINGS_HUE, m_effects.hue->value() ); + settings.writeEntry( SETTINGS_CONTRAST, m_effects.contrast->value() ); + settings.writeEntry( SETTINGS_SATURATION, m_effects.saturation->value() ); + settings.writeEntry( SETTINGS_COLOURFILTERENABLED, m_effects.colour_correction->isChecked() ); } } //namespace cineplay @@ -597,8 +594,6 @@ QApplication::setColorSpec( QApplication::CustomColor ); QApplication a( argc, argv ); - q3InitNetworkProtocols(); - cineplay::CineCode* w = new cineplay::CineCode; a.setMainWidget( w ); Modified: cinesuite/cineplay-cinecode/trunk/src/CineCode.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/CineCode.h 2008-08-25 10:18:02 UTC (rev 185) +++ cinesuite/cineplay-cinecode/trunk/src/CineCode.h 2008-08-25 23:24:30 UTC (rev 186) @@ -29,7 +29,8 @@ #include <vector> // qt -#include <qwidget.h> +#include <QWidget> + //Added by qt3to4: #include <QResizeEvent> #include <QDragEnterEvent> @@ -38,9 +39,11 @@ #include <QMouseEvent> #include <QKeyEvent> +// generated +#include "ui_filters.h" + class Tray; -class ui_filters; -class Q3WidgetStack; +class QStackedWidget; namespace cineplay { @@ -106,7 +109,7 @@ Common* m_impl; Tray* m_effectsTray; - ui_filters* m_effects; + Ui::filters m_effects; Tray* m_encodeTray; QWidget* m_encodeTrayPlaceholder; @@ -116,7 +119,7 @@ EncodeJobList m_encodeJobList; WidgetVector m_favouriteTrayEntries; - Q3WidgetStack* m_encodeStack; + QStackedWidget* m_encodeStack; FrameRangeList m_frameRanges; Ui::Main ui; Modified: cinesuite/cineplay-cinecode/trunk/src/Common.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-08-25 10:18:02 UTC (rev 185) +++ cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-08-25 23:24:30 UTC (rev 186) @@ -24,7 +24,6 @@ #include <fstream> // local -#include "Browser.h" #include "Download.h" #include "Info.h" #include "Release.h" @@ -49,6 +48,7 @@ #include "ui_styledlg.h" // qt +#include <QDesktopServices> #include <QApplication> #include <QCursor> #include <QFileDialog> @@ -810,9 +810,9 @@ #endif #ifdef Q_OS_MACX - openBrowserWindow( QUrl( QString( "file://%1/../Resources/help/%2" ).arg( qApp->applicationDirPath() ).arg( helpFile ) ) ); + QDesktopServices::openUrl( QUrl( QString( "file://%1/../Resources/help/%2" ).arg( qApp->applicationDirPath() ).arg( helpFile ) ) ); #else - openBrowserWindow( QUrl( QString( "file://%1/help/%2" ).arg( qApp->applicationDirPath() ).arg( helpFile ) ) ); + QDesktopServices::openUrl( QUrl( QString( "file://%1/help/%2" ).arg( qApp->applicationDirPath() ).arg( helpFile ) ) ); #endif //Q_OS_MACX } @@ -870,9 +870,9 @@ DEBUG_LOG; #ifdef BUILD_CINECODE - openBrowserWindow( QUrl( "http://cinefx.org/cinecode" ) ); + QDesktopServices::openUrl( QUrl( "http://cinefx.org/cinecode" ) ); #else - openBrowserWindow( QUrl( "http://cinefx.org/cineplay" ) ); + QDesktopServices::openUrl( QUrl( "http://cinefx.org/cineplay" ) ); #endif } Modified: cinesuite/cineplay-cinecode/trunk/src/EncodeTrayEntry.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/EncodeTrayEntry.cpp 2008-08-25 10:18:02 UTC (rev 185) +++ cinesuite/cineplay-cinecode/trunk/src/EncodeTrayEntry.cpp 2008-08-25 23:24:30 UTC (rev 186) @@ -77,7 +77,7 @@ void execute() { - m_entry->progress->wrapped_setProgress( m_pos ); + m_entry->ui.progress->wrapped_setProgress( m_pos ); } }; @@ -107,7 +107,7 @@ { m_entry->ui.top_label->setText( "complete" ); m_entry->ui.bottom_label->setText( "remove" ); - m_entry->progress->wrapped_setProgress( 100.0 ); + m_entry->ui.progress->wrapped_setProgress( 100.0 ); m_entry->ui.top_button->setEnabled( false ); SetState( m_entry, Green ); m_entry->setFinished(); @@ -190,9 +190,9 @@ m_job->SetCallback( new TrayCallbackDelegate( this ) ); // initialize widgets - progress->wrapped_setTotal(100.0); + ui.progress->wrapped_setTotal(100.0); - ui.top_button->local_setOn( false ); + ui.top_button->setDown( false ); ui.top_button->setProperty( "on", true ); connect( ui.top_button, SIGNAL( clicked() ), this, SLOT( onPlayPause() ) ); @@ -202,8 +202,8 @@ SetState( this, Yellow ); QFileInfo finfo( job->GetInputFilename() ); - name_label->setText( finfo.baseName( true ) ); - size_label->setText( "desktop" ); + ui.name_label->setText( finfo.baseName( true ) ); + ui.size_label->setText( "desktop" ); ui.bottom_label->setText( "cancel" ); } @@ -253,7 +253,7 @@ } else { - encode_tray_entry::customEvent(e); + QWidget::customEvent(e); } } Modified: cinesuite/cineplay-cinecode/trunk/src/ReleaseDlg.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/ReleaseDlg.cpp 2008-08-25 10:18:02 UTC (rev 185) +++ cinesuite/cineplay-cinecode/trunk/src/ReleaseDlg.cpp 2008-08-25 23:24:30 UTC (rev 186) @@ -22,13 +22,14 @@ #include "SkinDlg.h" // qt -#include <qurl.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qstring.h> -#include <qcheckbox.h> -#include <qfile.h> -#include <qfileinfo.h> +#include <QUrl> +#include <QLabel> +#include <QPushButton> +#include <QString> +#include <QCheckBox> +#include <QFile> +#include <QFileInfo> +#include <QDesktopServices> // ui #include "ui_releaseDialog.h" @@ -93,9 +94,9 @@ { if ( redirect ) #ifdef BUILD_CINECODE - openBrowserWindow( QUrl( "http://cinefx.org/cinecode" ) ); + QDesktopServices::openUrl( QUrl( "http://cinefx.org/cinecode" ) ); #else - openBrowserWindow( QUrl( "http://cinefx.org/cineplay" ) ); + QDesktopServices::openUrl( QUrl( "http://cinefx.org/cineplay" ) ); #endif //BUILD_CINECODE emit done( redirect, upchk ); this->skinDlg->hide(); Modified: cinesuite/cineplay-cinecode/trunk/src/ReleaseDlg.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/ReleaseDlg.h 2008-08-25 10:18:02 UTC (rev 185) +++ cinesuite/cineplay-cinecode/trunk/src/ReleaseDlg.h 2008-08-25 23:24:30 UTC (rev 186) @@ -21,10 +21,8 @@ #pragma once -#include "Browser.h" - // qt -#include <qobject.h> +#include <QObject> class QString; Modified: cinesuite/cineplay-cinecode/trunk/src/common.pri =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/common.pri 2008-08-25 10:18:02 UTC (rev 185) +++ cinesuite/cineplay-cinecode/trunk/src/common.pri 2008-08-25 23:24:30 UTC (rev 186) @@ -26,7 +26,6 @@ HEADERS += \ AddFavouriteDlg.h \ - Browser.h \ Common.h \ Download.h \ Info.h \ @@ -56,7 +55,6 @@ SOURCES += \ AddFavouriteDlg.cpp \ - Browser.cpp \ Common.cpp \ Download.cpp \ Info.cpp \ Modified: cinesuite/cineplay-cinecode/trunk/src/windows/filters.ui =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/windows/filters.ui 2008-08-25 10:18:02 UTC (rev 185) +++ cinesuite/cineplay-cinecode/trunk/src/windows/filters.ui 2008-08-25 23:24:30 UTC (rev 186) @@ -2,8 +2,8 @@ <author></author> <comment></comment> <exportmacro></exportmacro> - <class>ui_filters</class> - <widget class="QWidget" name="ui_filters" > + <class>filters</class> + <widget class="QWidget" name="filters" > <property name="geometry" > <rect> <x>0</x> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-09-08 22:16:41
|
Revision: 187 http://editopia.svn.sourceforge.net/editopia/?rev=187&view=rev Author: timdewhirst Date: 2008-09-08 22:16:35 +0000 (Mon, 08 Sep 2008) Log Message: ----------- cinesuite - mainly header reordering and tidy up - more headers to native Qt4 Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp cinesuite/cineplay-cinecode/trunk/src/CineCode.h cinesuite/cineplay-cinecode/trunk/src/CinePlay.cpp cinesuite/cineplay-cinecode/trunk/src/CinePlay.h cinesuite/cineplay-cinecode/trunk/src/Common.cpp cinesuite/cineplay-cinecode/trunk/src/Common.h cinesuite/cineplay-cinecode/trunk/src/EncodeJob.cpp cinesuite/cineplay-cinecode/trunk/src/EncodeTrayEntry.cpp cinesuite/cineplay-cinecode/trunk/src/FilterGraph.cpp cinesuite/cineplay-cinecode/trunk/src/GridLayoutCallback.cpp cinesuite/cineplay-cinecode/trunk/src/GridLayoutCallback.h cinesuite/cineplay-cinecode/trunk/src/Info.cpp cinesuite/cineplay-cinecode/trunk/src/OpenGLStore.cpp cinesuite/cineplay-cinecode/trunk/src/OpenGLStore.h cinesuite/cineplay-cinecode/trunk/src/Player.cpp cinesuite/cineplay-cinecode/trunk/src/Player.h cinesuite/cineplay-cinecode/trunk/src/PlayerDelegate.h cinesuite/cineplay-cinecode/trunk/src/PlayerMultiplexer.hpp cinesuite/cineplay-cinecode/trunk/src/Release.cpp cinesuite/cineplay-cinecode/trunk/src/Utils.cpp cinesuite/cineplay-cinecode/trunk/src/Utils.h cinesuite/cineplay-cinecode/trunk/src/common.pri cinesuite/cineplay-cinecode/trunk/src/config.pri cinesuite/cineplay-cinecode/trunk/src/olibs.pri cinesuite/cineplay-cinecode/trunk/src/widgets/histogram.h cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.hpp cinesuite/cineplay-cinecode/trunk/src/widgets/shader_state.h cinesuite/cineplay-cinecode/trunk/src/widgets/texture.h Modified: cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp 2008-09-08 22:16:35 UTC (rev 187) @@ -46,15 +46,13 @@ #include <QStringList> #include <QSettings> #include <QStackedWidget> - -//Added by qt3to4: #include <QKeyEvent> #include <QCustomEvent> #include <QDragEnterEvent> #include <QDropEvent> #include <QResizeEvent> #include <QMouseEvent> -#include <Q3VBoxLayout> +#include <QDebug> // olibs #include <openmedialib/ml/filter.hpp> @@ -72,13 +70,13 @@ }; CineCode::CineCode( QWidget *parent, const char *name ) - : QWidget( parent, name ), - m_impl( new Common( this ) ) + : QWidget( parent, name ) { DEBUG_LOG; ui.setupUi( this ); setWindowFlags( Qt::FramelessWindowHint | Qt::Window ); + m_impl = new Common( this ); //general main window setup setAcceptDrops( true ); @@ -110,7 +108,7 @@ storeFilterSettings(); } -bool CineCode::init( QStringList* args ) +bool CineCode::init( const QStringList& args ) { DEBUG_LOG; @@ -197,7 +195,7 @@ QWidget* toggleLeftTrayButton = CineUtils::FindWidget( "toggle_left_tray", this ); connect( toggleLeftTrayButton, SIGNAL( toggled( bool ) ), m_effectsTray, SLOT( setShown( bool ) ) ); - Q3VBoxLayout* layout = new Q3VBoxLayout( m_effectsTray->placeholder() ); + QVBoxLayout* layout = new QVBoxLayout( m_effectsTray->placeholder() ); QWidget* effectsWidget = new QWidget; m_effects.setupUi( effectsWidget ); layout->addWidget( effectsWidget ); @@ -587,29 +585,24 @@ } //namespace cineplay -int main( int argc, char **argv ) +int main( int argc, char *argv[] ) { - qInstallMsgHandler( LogMessageHandler ); + // qInstallMsgHandler( LogMessageHandler ); - QApplication::setColorSpec( QApplication::CustomColor ); QApplication a( argc, argv ); - + cineplay::CineCode* w = new cineplay::CineCode; a.setMainWidget( w ); - QStringList args; - for( int i=0; i<argc; ++i ) - args.append( argv[i] ); - - if ( !w->init( &args ) ) + if ( !w->init( a.arguments() ) ) return 1; DEBUG_LOG << "starting app"; - if( args.size() == 2 ) + if( a.arguments().size() == 2 ) { - if( !w->LoadCmdLineInput( argv[1] ) ) + if( !w->LoadCmdLineInput( a.arguments()[1] ) ) return -1; } Modified: cinesuite/cineplay-cinecode/trunk/src/CineCode.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/CineCode.h 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/CineCode.h 2008-09-08 22:16:35 UTC (rev 187) @@ -63,7 +63,7 @@ ~CineCode(); bool LoadCmdLineInput( const QString& fname ); - bool init( QStringList* args ); + bool init( const QStringList& args ); protected: virtual void keyPressEvent( QKeyEvent* ); Modified: cinesuite/cineplay-cinecode/trunk/src/CinePlay.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/CinePlay.cpp 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/CinePlay.cpp 2008-09-08 22:16:35 UTC (rev 187) @@ -55,7 +55,7 @@ setAcceptDrops( true ); } -bool CinePlay::init( QStringList* args ) +bool CinePlay::init( const QStringList& args ) { DEBUG_LOG; Modified: cinesuite/cineplay-cinecode/trunk/src/CinePlay.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/CinePlay.h 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/CinePlay.h 2008-09-08 22:16:35 UTC (rev 187) @@ -43,7 +43,7 @@ CinePlay( QWidget *parent=0, const char *name=0 ); bool LoadCmdLineInput( const QString& fname ); - bool init( QStringList* args ); + bool init( const QStringList& args ); protected: virtual void keyPressEvent( QKeyEvent* ); Modified: cinesuite/cineplay-cinecode/trunk/src/Common.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-09-08 22:16:35 UTC (rev 187) @@ -18,12 +18,18 @@ // Copyright (C) 2008 Audiotube Ltd. // For more information, see http://www.audiotube.com +// Must be included before any other gl headers +#include "shader_state.h" + #include "Common.h" // std #include <fstream> // local +#include "OpenGLStore.h" +#include "opengl_store.hpp" +#include "sdl_store.hpp" #include "Download.h" #include "Info.h" #include "Release.h" @@ -34,7 +40,6 @@ #include "PlayerDelegate.h" #include "AddFavouriteDlg.h" #include "RemoveFavouriteDlg.h" -#include "OpenGLStore.h" #include "Utils.h" #include "Tray.h" #include "log.h" @@ -52,11 +57,10 @@ #include <QApplication> #include <QCursor> #include <QFileDialog> -#include <qstylefactory.h> -#include <qvariant.h> -#include <qmessagebox.h> -#include <qsettings.h> -#include <qdir.h> +#include <QVariant> +#include <QMessageBox> +#include <QSettings> +#include <QDir> #include <QDragEnterEvent> #include <QDropEvent> #include <QEvent> @@ -69,11 +73,11 @@ #include <qlistview.h> #include <QRegExp> #include <QThread> -#include <qgl.h> #include <QLabel> #include <QBuffer> #include <QDesktopWidget> #include <QUrl> +#include <QDebug> // olibs #include <openpluginlib/pl/openpluginlib.hpp> @@ -124,11 +128,10 @@ DEBUG_LOG; #ifdef Q_OS_WIN32 - hLib = LoadLibraryA( "bblogger.dll" ); + // hLib = LoadLibraryA( "bblogger.dll" ); #endif //Look for all our widgets and stuff - CineUtils::AddWidgetToParentLayout( parent, parent ); parent->setCaption( SETTINGS_APPTITLE ); QWidget *ht = CineUtils::FindWidget( WIDGET_TOOLBARPLACE, parent ); @@ -268,12 +271,13 @@ saveTrayStates(); } -bool Common::init( QStringList* args ) +bool Common::init( const QStringList& args ) { DEBUG_LOG; - QStringList::iterator I = args->begin(); - while ( I != args->end() ) + QStringList::const_iterator I = args.begin(); + QStringList::const_iterator E = args.end(); + while ( I != E ) { if ( *I == "-version" || *I == "-v" ) { @@ -289,7 +293,7 @@ Log::setLogLevel( 4 ); Log::setDestination( log_stream ); atexit( close_log ); - I = args->erase( I ); + ++I; } else { @@ -299,7 +303,7 @@ } //Init OpenLibraries - CineUtils::InitOpenLibraries( qApp->applicationDirPath() ); + CineUtils::InitOpenLibraries( QCoreApplication::applicationDirPath() ); if( !SetupStores() ) { @@ -317,12 +321,6 @@ if( m_volumeSlider ) { - //HACK! jahwidgets slider on the mac is not working for now. -#ifdef Q_OS_MACX - m_volumeSlider->setProperty("thumb", QVariant(QPixmap()) ); - m_volumeSlider->setProperty("tray", QVariant(QPixmap()) ); -#endif - int volume_max = m_volumeSlider->property( "maxValue" ).toInt(); int vol = 0; Modified: cinesuite/cineplay-cinecode/trunk/src/Common.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Common.h 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/Common.h 2008-09-08 22:16:35 UTC (rev 187) @@ -21,7 +21,6 @@ #pragma once // local -#include "Jah.h" #include "Player.h" #include "PlayList.h" #include "PlayerMultiplexer.hpp" @@ -43,6 +42,12 @@ class Tray; class QMenu; class QMenuBar; +class QStringList; +class QKeyEvent; +class QMouseEvent; +class QResizeEvent; +class QDragEnterEvent; +class QDropEvent; namespace cineplay { @@ -55,7 +60,7 @@ Common( QWidget* parent ); ~Common(); - bool init( QStringList* args ); + bool init( const QStringList& args ); bool LoadCmdLineInput( const QString& fname ); bool HandlePush() { return m_handlePush; } void FrameUpdate( IPlayerPtr, const ml::frame_type_ptr& frame ); Modified: cinesuite/cineplay-cinecode/trunk/src/EncodeJob.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/EncodeJob.cpp 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/EncodeJob.cpp 2008-09-08 22:16:35 UTC (rev 187) @@ -182,10 +182,10 @@ FilterGraph *fg = new FilterGraph; FilterGraphLoader ldr; - fg->SetDefaultInput( CineUtils::ToWString( m_infile ) ); - fg->SetDefaultStore( CineUtils::ToWString( m_outfile ) ); + fg->SetDefaultInput( m_infile.toStdWString() ); + fg->SetDefaultStore( m_outfile.toStdWString() ); - bool succ = ldr.Load( CineUtils::ToWString( m_cfgfile ), fg ); + bool succ = ldr.Load( m_cfgfile.toStdWString(), fg ); if( !succ ) { Modified: cinesuite/cineplay-cinecode/trunk/src/EncodeTrayEntry.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/EncodeTrayEntry.cpp 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/EncodeTrayEntry.cpp 2008-09-08 22:16:35 UTC (rev 187) @@ -22,7 +22,6 @@ #include "Utils.h" #include "SetupDefs.h" -#include "Jah.h" #include "progress.h" #include "EncodeJob.h" @@ -33,7 +32,6 @@ #include <QObject> #include <QApplication> - enum State { Grey = 0, Yellow, Modified: cinesuite/cineplay-cinecode/trunk/src/FilterGraph.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/FilterGraph.cpp 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/FilterGraph.cpp 2008-09-08 22:16:35 UTC (rev 187) @@ -576,7 +576,7 @@ void ParseProperty(pl::pcos::property &prop, QDomElement &el, FilterGraph *graph) { - std::wstring wstr = CineUtils::ToWString( el.text() ); + std::wstring wstr = el.text().toStdWString(); //we look for a period to see if this element text is another node property reference int pos = wstr.find_first_of('.'); @@ -649,7 +649,7 @@ QString propName = ExpectAttribute(el, "name"); - pl::pcos::property prop = ExpectNodeProperty(properties, CineUtils::ToWString(name), CineUtils::ToWString(propName) ); + pl::pcos::property prop = ExpectNodeProperty(properties, name.toStdWString(), propName.toStdWString() ); ParseProperty( prop, el, graph ); } } @@ -670,7 +670,7 @@ { QDomElement el = vars[t]; QString nameStr = ExpectAttribute(el, "name"); - graph->SetVar( CineUtils::ToWString(nameStr), CineUtils::ToWString(el.text()) ); + graph->SetVar( nameStr.toStdWString(), el.text().toStdWString() ); } @@ -683,7 +683,7 @@ QString classStr = ExpectAttribute(el, "class"); QString nameStr = ExpectAttribute(el, "name"); - FilterGraphNode *sgnode = graph->PushFilter( CineUtils::ToWString(nameStr), CineUtils::ToWString(classStr) ); + FilterGraphNode *sgnode = graph->PushFilter( nameStr.toStdWString(), classStr.toStdWString() ); ParseProperties( el, sgnode->node()->properties(), nameStr, graph ); } @@ -702,7 +702,7 @@ QString classStr = ExpectAttribute(el, "class"); - FilterGraphInput *sgnode = graph->PushInput( CineUtils::ToWString(nameStr), CineUtils::ToWString(classStr) ); + FilterGraphInput *sgnode = graph->PushInput( nameStr.toStdWString(), classStr.toStdWString() ); ParseProperties( el, sgnode->node()->properties(), nameStr, graph ); } } @@ -719,7 +719,7 @@ QString toStr = ExpectAttribute(el, "to"); int index = AttributeInt(el, "index", 0); - graph->Connect( CineUtils::ToWString(fromStr), CineUtils::ToWString(toStr), index ); + graph->Connect( fromStr.toStdWString(), toStr.toStdWString(), index ); } @@ -777,7 +777,7 @@ { // try // { - QString qfname = CineUtils::ToQString(fileName); + QString qfname = QString::fromStdWString( fileName ); QFile f( qfname ); if( !f.open(QIODevice::ReadOnly) ) throw FGException( "file not found", qfname.ascii() ); Modified: cinesuite/cineplay-cinecode/trunk/src/GridLayoutCallback.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/GridLayoutCallback.cpp 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/GridLayoutCallback.cpp 2008-09-08 22:16:35 UTC (rev 187) @@ -56,7 +56,7 @@ quad3 grid_layout_callback::layout( int id ) { - if ( id >= ws_->number_stores() ) + if ( static_cast< unsigned int >( id ) >= ws_->number_stores() ) return quad3(); initializeQuads( ws_->number_stores() ); @@ -124,7 +124,7 @@ void grid_layout_callback::move( int id, const vector3& v ) { - if ( id >= ws_->number_stores() ) + if ( static_cast< unsigned int >( id ) >= ws_->number_stores() ) return; quad3_list::iterator I = quads_.begin(); Modified: cinesuite/cineplay-cinecode/trunk/src/GridLayoutCallback.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/GridLayoutCallback.h 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/GridLayoutCallback.h 2008-09-08 22:16:35 UTC (rev 187) @@ -21,15 +21,17 @@ #pragma once // qt -#include <qobject.h> +#include <QObject> // local -#include "Jah.h" #include "Geometry.hpp" +#include "widget_store.hpp" // std #include <list> +namespace jw = jahwidgets::qt3; + // layout/callback implementation class grid_layout_callback : public QObject, public jw::widget_store_callback Modified: cinesuite/cineplay-cinecode/trunk/src/Info.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Info.cpp 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/Info.cpp 2008-09-08 22:16:35 UTC (rev 187) @@ -21,9 +21,16 @@ #include "Info.h" // local -#include "Jah.h" #include "log.h" +// olibs +#include <openmedialib/ml/input.hpp> +#include <openmedialib/ml/frame.hpp> +#include <openmedialib/ml/filter.hpp> +#include <openmedialib/ml/store.hpp> +#include <openmedialib/ml/utilities.hpp> +#include <openimagelib/il/basic_image.hpp> + // qt #include <QWidget> #include <QFileInfo> @@ -34,7 +41,11 @@ #include "ui_infoDialog.h" #include "SkinDlg.h" +namespace ml = olib::openmedialib::ml; +namespace il = olib::openimagelib::il; +namespace pl = olib::openpluginlib; + class Info::InfoImpl : public QObject { public: Modified: cinesuite/cineplay-cinecode/trunk/src/OpenGLStore.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/OpenGLStore.cpp 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/OpenGLStore.cpp 2008-09-08 22:16:35 UTC (rev 187) @@ -18,11 +18,145 @@ // Copyright (C) 2008 Audiotube Ltd. // For more information, see http://www.audiotube.com +// glew +#include <GL/glew.h> + #include "OpenGLStore.h" - namespace cineplay { + + class GLUploadFormat + { + protected: + int m_texWidth; + int m_texHeight; + int m_iWidth; + int m_iHeight; + + GLuint CreateTexture(int &inOutWidth, int &inoutHeight); + void DrawTexQuad(float *verts, float *texcoords); + void PillarLetterBox(float *verts, float aspect, const QRect &drawRect); + void SpliceBuffer( const unsigned char *yPixels, + const unsigned char *uPixels, + const unsigned char *vPixels, + int w, int h, + unsigned char *outbuffer ); + + private: + bool m_initialised; + + public: + GLUploadFormat(); + virtual ~GLUploadFormat() {} + + virtual bool IsSupported() = 0; + + virtual void Init(); + virtual std::wstring Pf() = 0; + virtual void UpdateImage( const ml::image_type_ptr &image ) = 0; + virtual void Draw( const QRect &r ) = 0; + + bool WasInitialised() const; + }; + + + class GLRgbBaseFormat : public GLUploadFormat + { + GLuint m_tex; + + virtual GLenum GetFormat() = 0; + + public: + GLRgbBaseFormat(); + ~GLRgbBaseFormat(); + bool IsSupported(); + void Init(); + void UpdateImage( const ml::image_type_ptr &image ); + void Draw( const QRect &r ); + }; + + + class GLRgbaFormat : public GLRgbBaseFormat + { + public: + std::wstring Pf() { return L"r8g8b8a8"; } + GLenum GetFormat() { return GL_RGBA; } + }; + + class GLBgraFormat : public GLRgbBaseFormat + { + public: + std::wstring Pf() { return L"b8g8r8a8"; } + GLenum GetFormat() { return GL_BGRA_EXT; } + }; + + class GLAbgrFormat : public GLRgbBaseFormat + { + public: + std::wstring Pf() { return L"a8b8g8r8"; } + GLenum GetFormat() { return GL_ABGR_EXT; } + }; + + + class GLYuv420pFormat : public GLUploadFormat + { + protected: + GLuint m_tex; + GLhandleARB m_program; + int m_texWidth; + int m_texHeight; + unsigned char* m_uploadBuffer; + + public: + GLYuv420pFormat(); + ~GLYuv420pFormat(); + std::wstring Pf() { return L"yuv420p"; } + bool IsSupported(); + void Init(); + void UpdateImage( const ml::image_type_ptr &image ); + void Draw( const QRect &r ); + }; + + + class GLYuv420pFPFormat : public GLUploadFormat + { + protected: + GLuint m_tex; + GLuint m_program; + int m_texWidth; + int m_texHeight; + unsigned char* m_uploadBuffer; + + public: + GLYuv420pFPFormat(); + ~GLYuv420pFPFormat(); + std::wstring Pf() { return L"yuv420p"; } + bool IsSupported(); + void Init(); + void UpdateImage( const ml::image_type_ptr &image ); + void Draw( const QRect &r ); + }; + + class GLYuv420pSlowFormat : public GLUploadFormat + { + protected: + GLuint m_yTex; + int m_texWidth; + int m_texHeight; + unsigned char* m_uploadBuffer; + + public: + GLYuv420pSlowFormat(); + ~GLYuv420pSlowFormat(); + std::wstring Pf() { return L"yuv420p"; } + bool IsSupported(); + void Init(); + void UpdateImage( const ml::image_type_ptr &image ); + void Draw( const QRect &r ); + }; + + int nextPower(int val) { int pw = 1; Modified: cinesuite/cineplay-cinecode/trunk/src/OpenGLStore.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/OpenGLStore.h 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/OpenGLStore.h 2008-09-08 22:16:35 UTC (rev 187) @@ -19,148 +19,29 @@ // For more information, see http://www.audiotube.com -#ifndef OPENGL_STORE_H -#define OPENGL_STORE_H +#pragma once +#include "config.h" +#include "widget_store.hpp" -#include "Jah.h" +// qt +#include <QGLWidget> -#include "qgl.h" +// olibs +#include <openmedialib/ml/frame.hpp> +#include <openmedialib/ml/store.hpp> +#include <openimagelib/il/basic_image.hpp> -namespace cineplay -{ +// std +#include <string> - class GLUploadFormat - { - protected: - int m_texWidth; - int m_texHeight; - int m_iWidth; - int m_iHeight; +namespace jw = jahwidgets::qt3; +namespace ml = olib::openmedialib::ml; +namespace il = olib::openimagelib::il; - GLuint CreateTexture(int &inOutWidth, int &inoutHeight); - void DrawTexQuad(float *verts, float *texcoords); - void PillarLetterBox(float *verts, float aspect, const QRect &drawRect); - void SpliceBuffer( const unsigned char *yPixels, - const unsigned char *uPixels, - const unsigned char *vPixels, - int w, int h, - unsigned char *outbuffer ); - - private: - bool m_initialised; - public: - GLUploadFormat(); - virtual ~GLUploadFormat() {} - - virtual bool IsSupported() = 0; - - virtual void Init(); - virtual std::wstring Pf() = 0; - virtual void UpdateImage( const ml::image_type_ptr &image ) = 0; - virtual void Draw( const QRect &r ) = 0; - - bool WasInitialised() const; - }; - - - class GLRgbBaseFormat : public GLUploadFormat - { - GLuint m_tex; - - virtual GLenum GetFormat() = 0; - - public: - GLRgbBaseFormat(); - ~GLRgbBaseFormat(); - bool IsSupported(); - void Init(); - void UpdateImage( const ml::image_type_ptr &image ); - void Draw( const QRect &r ); - }; - - - class GLRgbaFormat : public GLRgbBaseFormat - { - public: - std::wstring Pf() { return L"r8g8b8a8"; } - GLenum GetFormat() { return GL_RGBA; } - }; - - class GLBgraFormat : public GLRgbBaseFormat - { - public: - std::wstring Pf() { return L"b8g8r8a8"; } - GLenum GetFormat() { return GL_BGRA_EXT; } - }; - - class GLAbgrFormat : public GLRgbBaseFormat - { - public: - std::wstring Pf() { return L"a8b8g8r8"; } - GLenum GetFormat() { return GL_ABGR_EXT; } - }; - - - class GLYuv420pFormat : public GLUploadFormat - { - protected: - GLuint m_tex; - GLhandleARB m_program; - int m_texWidth; - int m_texHeight; - unsigned char* m_uploadBuffer; - - public: - GLYuv420pFormat(); - ~GLYuv420pFormat(); - std::wstring Pf() { return L"yuv420p"; } - bool IsSupported(); - void Init(); - void UpdateImage( const ml::image_type_ptr &image ); - void Draw( const QRect &r ); - }; - - - class GLYuv420pFPFormat : public GLUploadFormat - { - protected: - GLuint m_tex; - GLuint m_program; - int m_texWidth; - int m_texHeight; - unsigned char* m_uploadBuffer; - - public: - GLYuv420pFPFormat(); - ~GLYuv420pFPFormat(); - std::wstring Pf() { return L"yuv420p"; } - bool IsSupported(); - void Init(); - void UpdateImage( const ml::image_type_ptr &image ); - void Draw( const QRect &r ); - }; - - class GLYuv420pSlowFormat : public GLUploadFormat - { - protected: - GLuint m_yTex; - int m_texWidth; - int m_texHeight; - unsigned char* m_uploadBuffer; - - public: - GLYuv420pSlowFormat(); - ~GLYuv420pSlowFormat(); - std::wstring Pf() { return L"yuv420p"; } - bool IsSupported(); - void Init(); - void UpdateImage( const ml::image_type_ptr &image ); - void Draw( const QRect &r ); - }; - - +namespace cineplay +{ class GLStore : public QGLWidget, public jw::widget_store { @@ -189,7 +70,3 @@ }; } - - - -#endif //OPENGL_STORE_H Modified: cinesuite/cineplay-cinecode/trunk/src/Player.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Player.cpp 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/Player.cpp 2008-09-08 22:16:35 UTC (rev 187) @@ -287,7 +287,7 @@ { typedef std::deque< ml::image_type_ptr > image_queue; image_queue queue_; - const int delay_; + const unsigned int delay_; public: frame_video_delay( int frames_delay ) Modified: cinesuite/cineplay-cinecode/trunk/src/Player.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Player.h 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/Player.h 2008-09-08 22:16:35 UTC (rev 187) @@ -18,11 +18,16 @@ // Copyright (C) 2008 Audiotube Ltd. // For more information, see http://www.audiotube.com +#pragma once -#ifndef CINEPLAY_PLAYER_H -#define CINEPLAY_PLAYER_H +// olibs +#include <openimagelib/il/openimagelib_plugin.hpp> +#include <openpluginlib/pl/timer.hpp> +#include <openmedialib/ml/openmedialib_plugin.hpp> -#include "Jah.h" +namespace ml = olib::openmedialib::ml; +namespace il = olib::openimagelib::il; +namespace pl = olib::openpluginlib; namespace cineplay { @@ -128,7 +133,3 @@ IPlayerPtr createPlayer(const ml::store_type_ptr &videoStore, const ml::store_type_ptr &audioStore); } //namespace cineplay - - - -#endif Modified: cinesuite/cineplay-cinecode/trunk/src/PlayerDelegate.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/PlayerDelegate.h 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/PlayerDelegate.h 2008-09-08 22:16:35 UTC (rev 187) @@ -21,16 +21,15 @@ #pragma once -#include <qstring.h> -#include <qevent.h> -#include <qsize.h> -#include <qwidget.h> - - +// local #include "Player.h" -#include "Jah.h" #include "SetupDefs.h" +// qt +#include <QString> +#include <QEvent> +#include <QSize> +#include <QWidget> namespace cineplay { Modified: cinesuite/cineplay-cinecode/trunk/src/PlayerMultiplexer.hpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/PlayerMultiplexer.hpp 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/PlayerMultiplexer.hpp 2008-09-08 22:16:35 UTC (rev 187) @@ -31,6 +31,8 @@ #include <vector> #include <string> +namespace jw = jahwidgets::qt3; + namespace cineplay { Modified: cinesuite/cineplay-cinecode/trunk/src/Release.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Release.cpp 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/Release.cpp 2008-09-08 22:16:35 UTC (rev 187) @@ -158,7 +158,7 @@ Release::~Release() {} -void Release::checkRelease( const QString& version ) +void Release::checkRelease( const QString& ) { #ifdef BUILD_CINECODE QString url( "http://updates.cinefx.org/cinecode/cinecode.txt" ); Modified: cinesuite/cineplay-cinecode/trunk/src/Utils.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Utils.cpp 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/Utils.cpp 2008-09-08 22:16:35 UTC (rev 187) @@ -21,7 +21,6 @@ #include "Utils.h" // local -#include "Jah.h" #include "log.h" // qt @@ -32,6 +31,11 @@ #include <QByteArray> #include <QBuffer> +// opl +#include <openimagelib/il/openimagelib_plugin.hpp> +#include <openpluginlib/pl/openpluginlib.hpp> +namespace pl = olib::openpluginlib; + // std #include <memory> #include <map> @@ -115,8 +119,7 @@ #include <cstdlib> -#include <qfileinfo.h> -#include <qdir.h> +#include <QFileInfo> QString createTemporaryFilename() @@ -290,22 +293,6 @@ #endif //Q_OS_MACX } -pl::wstring ToWString( const QString& s ) -{ - DEBUG_LOG << s.ascii(); - - std::string as_string = s; - return pl::to_wstring( as_string ); -} - -QString ToQString( const pl::wstring& s ) -{ - DEBUG_LOG << pl::to_string( s ); - - std::string as_string( pl::to_string( s ) ); - return QString::fromUtf8( as_string.data(), as_string.length() ); -} - il::image_type_ptr QImageToImage( const QImage& qimage ) { DEBUG_LOG; Modified: cinesuite/cineplay-cinecode/trunk/src/Utils.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Utils.h 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/Utils.h 2008-09-08 22:16:35 UTC (rev 187) @@ -25,10 +25,6 @@ #include <QByteArray> #include <QImage> -// opl -#include <openpluginlib/pl/string.hpp> -namespace pl = olib::openpluginlib; - // oil #include <openimagelib/il/basic_image.hpp> namespace il = olib::openimagelib::il; @@ -56,8 +52,6 @@ /// olibs utils void InitOpenLibraries( const QString& appDirPath ); -pl::wstring ToWString( const QString& ); -QString ToQString( const pl::wstring& ); /// image utils il::image_type_ptr QImageToImage( const QImage& ); Modified: cinesuite/cineplay-cinecode/trunk/src/common.pri =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/common.pri 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/common.pri 2008-09-08 22:16:35 UTC (rev 187) @@ -25,11 +25,10 @@ windows/favorite_tray_entry.ui HEADERS += \ + Common.h \ AddFavouriteDlg.h \ - Common.h \ Download.h \ Info.h \ - Jah.h \ OpenGLStore.h \ Player.h \ PlayerDelegate.h \ @@ -54,8 +53,8 @@ about.h SOURCES += \ + Common.cpp \ AddFavouriteDlg.cpp \ - Common.cpp \ Download.cpp \ Info.cpp \ OpenGLStore.cpp \ @@ -76,3 +75,4 @@ GridLayoutCallback.cpp \ Geometry.cpp \ about.cpp + Modified: cinesuite/cineplay-cinecode/trunk/src/config.pri =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/config.pri 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/config.pri 2008-09-08 22:16:35 UTC (rev 187) @@ -1,7 +1,6 @@ CONFIG += qt warn_on -CONFIG += release -#CONFIG += console +CONFIG += release console QT += xml network qt3support opengl win32 { Modified: cinesuite/cineplay-cinecode/trunk/src/olibs.pri =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/olibs.pri 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/olibs.pri 2008-09-08 22:16:35 UTC (rev 187) @@ -19,7 +19,6 @@ DEFINES += HAVE_CONFIG_H } -# OPL auto links, but we need to give the path. NB requires quotes. win32 { OLIB_LIBS = C:/OpenLibraries/lib/openlibraries-0.5.0 DEFINES += HAVE_GL_GLEW_H Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/histogram.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/widgets/histogram.h 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/widgets/histogram.h 2008-09-08 22:16:35 UTC (rev 187) @@ -14,11 +14,14 @@ #pragma warning ( disable:4251 ) #endif +// std #include <vector> +// olibs #include <openpluginlib/pl/shader_manager.hpp> #include <openimagelib/il/il.hpp> +// local #include "config.h" namespace pl = olib::openpluginlib; Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp 2008-09-08 22:16:35 UTC (rev 187) @@ -9,10 +9,11 @@ #include "mediaPtr.h" // qt -#include <qlayout.h> -#include <qevent.h> -#include <qtimer.h> -#include <qpoint.h> +#include <QLayout> +#include <QWheelEvent> +#include <QMouseEvent> +#include <QTimer> +#include <QPoint> // olibs #include <openimagelib/il/il.hpp> @@ -991,8 +992,8 @@ bool opengl_store::supported() const { - opengl_store* nonConst = const_cast< opengl_store* >( this ); - nonConst->glInit(); +// opengl_store* nonConst = const_cast< opengl_store* >( this ); +// nonConst->glInit(); return glWindowPos2f; } Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.hpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.hpp 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.hpp 2008-09-08 22:16:35 UTC (rev 187) @@ -5,18 +5,12 @@ // Released under the GPL. // For more information, see http://www.jahshaka.org. -#ifndef JW_OPENGL_STORE_H -#define JW_OPENGL_STORE_H +#pragma once -// this really shouldn't be required; check what's going on -#ifndef HAVE_GL_GLEW_H -#define HAVE_GL_GLEW_H -#endif - #include "config.h" #include "widget_store.hpp" -// Must be included before qgl.h +// Must be included before any other GL headers #include "shader_state.h" // qt @@ -70,5 +64,3 @@ }; } } - -#endif Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/shader_state.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/widgets/shader_state.h 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/widgets/shader_state.h 2008-09-08 22:16:35 UTC (rev 187) @@ -5,11 +5,11 @@ // Released under the GPL. // For more information, see http://www.jahshaka.org. -#ifndef JW_SHADER_STATE_H -#define JW_SHADER_STATE_H +#pragma once #include "config.h" +// olibs #include <openpluginlib/pl/shader_manager.hpp> namespace pl = olib::openpluginlib; @@ -50,5 +50,3 @@ }; } } - -#endif Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/texture.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/widgets/texture.h 2008-08-25 23:24:30 UTC (rev 186) +++ cinesuite/cineplay-cinecode/trunk/src/widgets/texture.h 2008-09-08 22:16:35 UTC (rev 187) @@ -9,13 +9,16 @@ #ifndef JW_TEXTURE_H #define JW_TEXTURE_H -#include <openpluginlib/pl/shader_manager.hpp> +// olibs #include <openobjectlib/sg/render_buffer.hpp> +// local #include "histogram.h" -#include <qgl.h> +// qt +#include <QGLWidget> + namespace jahwidgets { namespace qt3 { // The texture class holds the state between subsequent redraws of media sources This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-09-15 16:09:21
|
Revision: 188 http://editopia.svn.sourceforge.net/editopia/?rev=188&view=rev Author: timdewhirst Date: 2008-09-15 16:09:10 +0000 (Mon, 15 Sep 2008) Log Message: ----------- cinesuite - more bug fixes Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/Command.cpp cinesuite/cineplay-cinecode/trunk/src/Command.h cinesuite/cineplay-cinecode/trunk/src/Common.cpp cinesuite/cineplay-cinecode/trunk/src/OpenGLStore.cpp cinesuite/cineplay-cinecode/trunk/src/PlayList.cpp cinesuite/cineplay-cinecode/trunk/src/PlayList.h cinesuite/cineplay-cinecode/trunk/src/Player.cpp cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp cinesuite/cineplay-cinecode/trunk/src/widgets/slider.cpp Modified: cinesuite/cineplay-cinecode/trunk/src/Command.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Command.cpp 2008-09-08 22:16:35 UTC (rev 187) +++ cinesuite/cineplay-cinecode/trunk/src/Command.cpp 2008-09-15 16:09:10 UTC (rev 188) @@ -20,67 +20,84 @@ #include "Command.h" +// local +#include "log.h" + namespace cineplay { CommandQueue::CommandQueue() - { - m_pMutex = boost::shared_ptr<QMutex>(new QMutex(true)); - } + {} void CommandQueue::postCommand(CommandPtr cmd) { + if ( m_mutex.tryLock() ) { - QMutexLocker lock(m_pMutex.get()); m_deque.push_back( cmd ); + + CommandPtrQueue::const_iterator I = m_deque.begin(); + CommandPtrQueue::const_iterator E = m_deque.begin(); + + if ( I != E ) + { + CommandPtr cmd = *I; + ++I; + + for( ; I!=E; ++I ) + { + CommandPtr nextcmd = *I; + if( cmd->groupSimilar() && (cmd->id() == nextcmd->id()) ) + { + nextcmd->combine( cmd ); + cmd = nextcmd; + m_deque.pop_front(); + } + } + } + + m_mutex.unlock(); + m_condition.wakeAll(); } - m_condition.wakeAll(); + else + { + DEBUG_LOG << "CommandQueue::postCommand: failed to push command"; + } } CommandPtr CommandQueue::deliverCommand() { - QMutexLocker lock(m_pMutex.get()); - std::deque<CommandPtr>::const_iterator cit = m_deque.begin(); - CommandPtr cmd = *(cit); - if( cit == m_deque.end() ) - return CommandPtr(); + QMutexLocker lock( &m_mutex ); + CommandPtr cmd = m_deque.front(); + m_deque.pop_front(); - while( ++cit != m_deque.end() ) - { - CommandPtr nextcmd = *(cit); + return cmd; + } - //if( cmd->isSeek() && nextcmd->isSeek() ) + CommandPtrQueue CommandQueue::deliverAllCommands() + { + QMutexLocker lock( &m_mutex ); + CommandPtrQueue result = m_deque; + m_deque = CommandPtrQueue(); - if( cmd->groupSimilar() && (cmd->id() == nextcmd->id()) ) - { - nextcmd->combine( cmd ); - cmd = nextcmd; - m_deque.pop_front(); - } - else - break; - } - - m_deque.pop_front(); - return cmd; + return result; } unsigned short CommandQueue::size() { - QMutexLocker lock(m_pMutex.get()); + QMutexLocker lock( &m_mutex ); return static_cast<unsigned short>( m_deque.size() ); } bool CommandQueue::haveCommands() { - QMutexLocker lock(m_pMutex.get()); + QMutexLocker lock( &m_mutex ); return !m_deque.empty(); } void CommandQueue::waitForCommands() { - m_pMutex->lock(); - m_condition.wait( m_pMutex.get() ); + m_mutex.lock(); + m_condition.wait( &m_mutex ); } } //namespace cineplay Modified: cinesuite/cineplay-cinecode/trunk/src/Command.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Command.h 2008-09-08 22:16:35 UTC (rev 187) +++ cinesuite/cineplay-cinecode/trunk/src/Command.h 2008-09-15 16:09:10 UTC (rev 188) @@ -21,8 +21,13 @@ #pragma once +// boost #include <boost/shared_ptr.hpp> + +// std #include <deque> + +// qt #include <QMutex> #include <QWaitCondition> @@ -32,16 +37,17 @@ { class Command; typedef boost::shared_ptr< Command > CommandPtr; + typedef std::deque< CommandPtr > CommandPtrQueue; class Command { public: Command() {} virtual ~Command() {} - virtual void execute() = 0; - virtual int id() { return 0; } - virtual bool groupSimilar() { return false; } - virtual void combine( CommandPtr ) {} + virtual void execute() = 0; + virtual int id() { return 0; } + virtual bool groupSimilar() { return false; } + virtual void combine( CommandPtr ) {} }; @@ -51,16 +57,17 @@ CommandQueue(); ~CommandQueue() {} - void postCommand(CommandPtr cmd); - CommandPtr deliverCommand(); - unsigned short size(); - bool haveCommands(); - void waitForCommands(); + void postCommand( CommandPtr cmd ); + CommandPtr deliverCommand(); + CommandPtrQueue deliverAllCommands(); + unsigned short size(); + bool haveCommands(); + void waitForCommands(); private: - QWaitCondition m_condition; - std::deque<CommandPtr> m_deque; - boost::shared_ptr<QMutex> m_pMutex; + QWaitCondition m_condition; + CommandPtrQueue m_deque; + QMutex m_mutex; }; Modified: cinesuite/cineplay-cinecode/trunk/src/Common.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-09-08 22:16:35 UTC (rev 187) +++ cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-09-15 16:09:10 UTC (rev 188) @@ -467,7 +467,7 @@ bool audio_success = true; while( !m_audioStore ) { - log__ << "Common::SetupStores: creating audio store: " << storeTypeAudio.ascii(); + DEBUG_LOG << "Common::SetupStores: creating audio store: " << storeTypeAudio.toStdString(); if ( storeTypeAudio == "sdl" ) storeTypeAudio = "sdl_audio"; storeTypeAudio += ":"; @@ -486,8 +486,8 @@ if ( audioStoreTypes.isEmpty() ) break; + storeTypeAudio = audioStoreTypes.front(); audioStoreTypes.pop_front(); - storeTypeAudio = audioStoreTypes.front(); audio_success = true; } @@ -881,7 +881,7 @@ //check player state if(m_playButton) { - if(m_playButton->property("toggled").toBool()) + if(m_playButton->property( "checked" ).toBool()) activePlayer()->play(); else activePlayer()->stop(); @@ -907,7 +907,7 @@ { DEBUG_LOG; - QString url = m_mruList.getLastestUrl(); + QString url = m_mruList.getLatestUrl(); if(url.isEmpty()) return "./"; @@ -935,7 +935,7 @@ filtersString += filtersAsList[t]; } - QString fname = QFileDialog::getOpenFileName( m_mruList.getLastestUrl(), filtersString, m_parent ); + QString fname = QFileDialog::getOpenFileName( m_mruList.getLatestUrl(), filtersString, m_parent ); if(!fname.isEmpty()) { @@ -1693,7 +1693,10 @@ if( !IsDefaultImageName( le->filename().c_str() ) ) { LoadDefaultInput(); - QMessageBox::warning( m_parent, SETTINGS_APPTITLE, "Could not load that file", QMessageBox::Ok, QMessageBox::NoButton); + QMessageBox::warning( m_parent, + SETTINGS_APPTITLE, + tr( "Could not load that file" ), + QMessageBox::Ok, QMessageBox::NoButton ); m_lastFile = QString(); m_lastFrame = -1; } Modified: cinesuite/cineplay-cinecode/trunk/src/OpenGLStore.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/OpenGLStore.cpp 2008-09-08 22:16:35 UTC (rev 187) +++ cinesuite/cineplay-cinecode/trunk/src/OpenGLStore.cpp 2008-09-15 16:09:10 UTC (rev 188) @@ -23,6 +23,9 @@ #include "OpenGLStore.h" +// qt +#include <QDebug> + namespace cineplay { @@ -754,6 +757,7 @@ bool push( ml::frame_type_ptr frame ) { + qDebug() << "GLStorePrivate::push"; m_frame = frame; m_frameDirty = true; Modified: cinesuite/cineplay-cinecode/trunk/src/PlayList.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/PlayList.cpp 2008-09-08 22:16:35 UTC (rev 187) +++ cinesuite/cineplay-cinecode/trunk/src/PlayList.cpp 2008-09-15 16:09:10 UTC (rev 188) @@ -72,7 +72,7 @@ QSettings settings; - for(size_t t=0;t<m_urls.size();t++) + for( size_t t=0; t<m_urls.size(); ++t ) { QString str = SETTINGS_MRUROOT + QString::number( static_cast<uint>(t) ); settings.writeEntry( str, m_urls[t] ); @@ -114,13 +114,17 @@ QString CMruList::getUrl(unsigned int index) { DEBUG_LOG; + if ( m_urls.isEmpty() ) + return QString(); return m_urls[index]; } - QString CMruList::getLastestUrl() + QString CMruList::getLatestUrl() { DEBUG_LOG; + if ( m_urls.isEmpty() ) + return QString(); return m_urls.first(); } Modified: cinesuite/cineplay-cinecode/trunk/src/PlayList.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/PlayList.h 2008-09-08 22:16:35 UTC (rev 187) +++ cinesuite/cineplay-cinecode/trunk/src/PlayList.h 2008-09-15 16:09:10 UTC (rev 188) @@ -47,7 +47,7 @@ void readSettings(); void writeSettings(); void pushUrl(const QString &str); - QString getLastestUrl(); + QString getLatestUrl(); QString getUrl(unsigned int index); QStringList getUrls() { return m_urls; } void BuildMenu( QMenu* menu, QObject* receiver, const char* slot ); Modified: cinesuite/cineplay-cinecode/trunk/src/Player.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Player.cpp 2008-09-08 22:16:35 UTC (rev 187) +++ cinesuite/cineplay-cinecode/trunk/src/Player.cpp 2008-09-15 16:09:10 UTC (rev 188) @@ -28,6 +28,7 @@ #include <QThread> #include <QMutex> #include <QWaitCondition> +#include <QDebug> // boost #include <boost/enable_shared_from_this.hpp> @@ -528,7 +529,7 @@ , m_delay( audioStore->properties().get_property_with_string( "preroll" ).value< int >() ) { DEBUG_LOG; - start( QThread::LowPriority ); + start(); } Player::~Player() @@ -793,37 +794,31 @@ do { - if( m_commandQueue.haveCommands() ) + CommandPtrQueue commands = m_commandQueue.deliverAllCommands(); + // execute all queued commands + while( commands.size() ) { - // execute all queued commands - while( m_commandQueue.size() ) - { - CommandPtr cmd = m_commandQueue.deliverCommand(); - if(cmd) - { - // QMutexLocker lock( &m_mutex ); - cmd->execute(); - } - } + CommandPtr cmd = commands.front(); + cmd->execute(); + commands.pop_front(); } + + if(!m_playing) + { + if(m_input) + notifyStopping(); + + m_commandQueue.waitForCommands(); + } else { - if(!m_playing) + if(m_threadRunning) { - if(m_input) - notifyStopping(); - - m_commandQueue.waitForCommands(); + qDebug() << "Player::run: pushing frame"; + notifyPlaying(); + internalSeek( 1, SEEK_RELATIVE | SEEK_WITHAUDIO ); + storeFrame(); } - else - { - if(m_threadRunning) - { - notifyPlaying(); - internalSeek( 1, SEEK_RELATIVE | SEEK_WITHAUDIO ); - storeFrame(); - } - } } } while(m_threadRunning); Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp 2008-09-08 22:16:35 UTC (rev 187) +++ cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp 2008-09-15 16:09:10 UTC (rev 188) @@ -117,8 +117,6 @@ { frame_ = frame; - // Repaint right now: this is how stores are expected to behave - // this is safe only if done from the GUI thread parent_->owner()->update(); return frame; Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/slider.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/widgets/slider.cpp 2008-09-08 22:16:35 UTC (rev 187) +++ cinesuite/cineplay-cinecode/trunk/src/widgets/slider.cpp 2008-09-15 16:09:10 UTC (rev 188) @@ -295,30 +295,32 @@ private: QRect thumbRect() const { - if ( thumb.isNull() ) - { - QStyleOptionSlider opt; - opt.initFrom( this ); - return style()->subControlRect( QStyle::CC_Slider, &opt, QStyle::SC_SliderHandle ); - } - + QSize s = thumbSize(); + if ( orientation() == Qt::Vertical ) { - return QRect( QMAX(0, (width() - thumb.height()) / 2), - positionFromValue( value() ) - thumb.width() / 2, - thumb.height(), thumb.width() ); + return QRect( QMAX(0, (width() - s.height()) / 2), + positionFromValue( value() ) - s.width() / 2, + s.height(), s.width() ); } else { - return QRect( positionFromValue( value() ) - thumb.width() / 2, - QMAX( 0, (height() - thumb.height()) / 2), - thumb.width(), thumb.height() ); + return QRect( positionFromValue( value() ) - s.width() / 2, + QMAX( 0, (height() - s.height()) / 2), + s.width(), s.height() ); } } QSize thumbSize() const { - return thumbRect().size(); + if ( thumb.isNull() ) + { + QStyleOptionSlider opt; + opt.initFrom( this ); + return style()->subControlRect( QStyle::CC_Slider, &opt, QStyle::SC_SliderHandle ).size(); + } + + return thumb.size(); } int component( const QPoint& p ) const This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-09-16 04:28:30
|
Revision: 189 http://editopia.svn.sourceforge.net/editopia/?rev=189&view=rev Author: timdewhirst Date: 2008-09-16 11:28:20 +0000 (Tue, 16 Sep 2008) Log Message: ----------- cinesuite - linux build fixes Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/Geometry.cpp cinesuite/cineplay-cinecode/trunk/src/Geometry.hpp cinesuite/cineplay-cinecode/trunk/src/widgets/sdl_store.cpp cinesuite/cineplay-cinecode/trunk/src/widgets/valueFormatters.cpp Modified: cinesuite/cineplay-cinecode/trunk/src/Geometry.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Geometry.cpp 2008-09-15 16:09:10 UTC (rev 188) +++ cinesuite/cineplay-cinecode/trunk/src/Geometry.cpp 2008-09-16 11:28:20 UTC (rev 189) @@ -56,7 +56,7 @@ return result; } -static std::ostream& operator<<( std::ostream& os, const point3& p ) +std::ostream& operator<<( std::ostream& os, const point3& p ) { os << "(" << p.x << ", " << p.y << ", " << p.z << ")"; return os; @@ -80,7 +80,7 @@ return *this; } -static std::ostream& operator<<( std::ostream& os, const vector3& p ) +std::ostream& operator<<( std::ostream& os, const vector3& p ) { os << "(" << p.x << ", " << p.y << ", " << p.z << ")"; return os; @@ -93,7 +93,7 @@ return *this; } -static std::ostream& operator<<( std::ostream& os, const quad3& q ) +std::ostream& operator<<( std::ostream& os, const quad3& q ) { os << "[" << q.a << ", " << q.b << ", " << q.c << ", " << q.d << "]"; return os; Modified: cinesuite/cineplay-cinecode/trunk/src/Geometry.hpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Geometry.hpp 2008-09-15 16:09:10 UTC (rev 188) +++ cinesuite/cineplay-cinecode/trunk/src/Geometry.hpp 2008-09-16 11:28:20 UTC (rev 189) @@ -39,7 +39,7 @@ double x, y, z; }; -static std::ostream& operator<<( std::ostream& os, const point3& p ); +std::ostream& operator<<( std::ostream& os, const point3& p ); /// Basic 3D vector class struct vector3 @@ -53,7 +53,7 @@ double x, y, z; }; -static std::ostream& operator<<( std::ostream& os, const vector3& p ); +std::ostream& operator<<( std::ostream& os, const vector3& p ); point3 operator+( const point3& p, const vector3& v ); @@ -72,6 +72,6 @@ quad3& operator=( const quad3& ); }; -static std::ostream& operator<<( std::ostream& os, const quad3& q ); +std::ostream& operator<<( std::ostream& os, const quad3& q ); typedef std::list< quad3 > quad3_list; Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/sdl_store.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/widgets/sdl_store.cpp 2008-09-15 16:09:10 UTC (rev 188) +++ cinesuite/cineplay-cinecode/trunk/src/widgets/sdl_store.cpp 2008-09-16 11:28:20 UTC (rev 189) @@ -12,6 +12,7 @@ #include <QLayout> #include <QKeyEvent> #include <QCoreApplication> +#include <QDebug> // oml #include <openmedialib/ml/input.hpp> @@ -176,7 +177,7 @@ if ( !store_ ) return false; - qDebug( "sdl_store::init: store: %x", store_ ); + qDebug() << "sdl_store::init: store:" << (void *)store_.get(); pcos::property_container props = store_->properties(); pcos::property wid = props.get_property_with_string( "winid" ); Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/valueFormatters.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/widgets/valueFormatters.cpp 2008-09-15 16:09:10 UTC (rev 188) +++ cinesuite/cineplay-cinecode/trunk/src/widgets/valueFormatters.cpp 2008-09-16 11:28:20 UTC (rev 189) @@ -10,10 +10,10 @@ #include "valueFormatters.h" // qt -#include <qstring.h> +#include <QString> // std -#include <cmath> +#include <cstdlib> namespace jahwidgets { namespace qt3 { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-09-16 06:26:51
|
Revision: 190 http://editopia.svn.sourceforge.net/editopia/?rev=190&view=rev Author: timdewhirst Date: 2008-09-16 13:26:45 +0000 (Tue, 16 Sep 2008) Log Message: ----------- cinesuite - more build fixes - move frameRange.h to FrameRange.hpp [start of rationalization of naming scheme] Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp cinesuite/cineplay-cinecode/trunk/src/CineCode.h cinesuite/cineplay-cinecode/trunk/src/EncodeJob.h cinesuite/cineplay-cinecode/trunk/src/LogMessageHandler.h cinesuite/cineplay-cinecode/trunk/src/cinecode.pro cinesuite/cineplay-cinecode/trunk/src/olibs.pri cinesuite/cineplay-cinecode/trunk/src/widgets/media.h cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.hpp cinesuite/cineplay-cinecode/trunk/src/widgets/shader_state.cpp Added Paths: ----------- cinesuite/cineplay-cinecode/trunk/src/FrameRange.hpp Removed Paths: ------------- cinesuite/cineplay-cinecode/trunk/src/frameRange.h Modified: cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp 2008-09-16 11:28:20 UTC (rev 189) +++ cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp 2008-09-16 13:26:45 UTC (rev 190) @@ -39,6 +39,7 @@ #include <QApplication> #include <QGroupBox> #include <QMenuBar> +#include <QMenu> #include <QMessageBox> #include <QLayout> #include <QObject> @@ -85,7 +86,7 @@ m_impl->m_timeSlider->setProperty( "enableInOutControls", true ); // encode - Q3PopupMenu* encode = new Q3PopupMenu( m_impl->m_menubar ); + QMenu* encode = new QMenu( m_impl->m_menubar ); encode->setPalette( m_impl->m_menubar->palette() ); encode->insertItem( tr( "&encode..." ), this, SLOT( onEncode() ) ); encode->insertItem( tr( "&cancel all" ), this, SLOT( onCancelAll() ) ); Modified: cinesuite/cineplay-cinecode/trunk/src/CineCode.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/CineCode.h 2008-09-16 11:28:20 UTC (rev 189) +++ cinesuite/cineplay-cinecode/trunk/src/CineCode.h 2008-09-16 13:26:45 UTC (rev 190) @@ -22,7 +22,7 @@ #pragma once #include "ui_main_cinecode.h" -#include "frameRange.h" +#include "FrameRange.hpp" // std #include <list> Modified: cinesuite/cineplay-cinecode/trunk/src/EncodeJob.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/EncodeJob.h 2008-09-16 11:28:20 UTC (rev 189) +++ cinesuite/cineplay-cinecode/trunk/src/EncodeJob.h 2008-09-16 13:26:45 UTC (rev 190) @@ -21,12 +21,10 @@ #pragma once -#include <qstring.h> -#include <qstringlist.h> -#include <q3valuelist.h> -#include <q3popupmenu.h> +#include <QString> +#include <QStringList> -#include "FrameRange.h" +#include "FrameRange.hpp" namespace cineplay { Copied: cinesuite/cineplay-cinecode/trunk/src/FrameRange.hpp (from rev 188, cinesuite/cineplay-cinecode/trunk/src/frameRange.h) =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/FrameRange.hpp (rev 0) +++ cinesuite/cineplay-cinecode/trunk/src/FrameRange.hpp 2008-09-16 13:26:45 UTC (rev 190) @@ -0,0 +1,55 @@ +/* -*- mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */ + +// This file is part of Cineplay +// +// Cineplay is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// Cineplay is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +// +// Copyright (C) 2008 Audiotube Ltd. +// For more information, see http://www.audiotube.com + +#pragma once + +// std +#include <list> + +struct FrameRange +{ + FrameRange() + : in( -1 ), out( -1 ) + {} + + FrameRange( int in_, int out_ ) + : in( in_ ), out( out_ ) + {} + + bool isInValid() const + { + return in > 0; + } + + bool isValid() const + { + return isInValid() && out > 0; + } + + int length() const + { + return out - in; + } + + int in; + int out; +}; + +typedef std::list< FrameRange > FrameRangeList; Modified: cinesuite/cineplay-cinecode/trunk/src/LogMessageHandler.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/LogMessageHandler.h 2008-09-16 11:28:20 UTC (rev 189) +++ cinesuite/cineplay-cinecode/trunk/src/LogMessageHandler.h 2008-09-16 13:26:45 UTC (rev 190) @@ -33,10 +33,12 @@ break; } case QtWarningMsg: + // case QtSystemMsg: { WARNING_LOG << "warning: " << msg; break; } + case QtCriticalMsg: case QtFatalMsg: { CRITICAL_LOG << "fatal: " << msg; Modified: cinesuite/cineplay-cinecode/trunk/src/cinecode.pro =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/cinecode.pro 2008-09-16 11:28:20 UTC (rev 189) +++ cinesuite/cineplay-cinecode/trunk/src/cinecode.pro 2008-09-16 13:26:45 UTC (rev 190) @@ -16,7 +16,7 @@ EncodeJob.h \ EncodeTrayEntry.h \ FilterGraph.h \ - frameRange.h + FrameRange.hpp SOURCES += \ CineCode.cpp \ Deleted: cinesuite/cineplay-cinecode/trunk/src/frameRange.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/frameRange.h 2008-09-16 11:28:20 UTC (rev 189) +++ cinesuite/cineplay-cinecode/trunk/src/frameRange.h 2008-09-16 13:26:45 UTC (rev 190) @@ -1,55 +0,0 @@ -/* -*- mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */ - -// This file is part of Cineplay -// -// Cineplay is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// Cineplay is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. -// -// Copyright (C) 2008 Audiotube Ltd. -// For more information, see http://www.audiotube.com - -#pragma once - -// std -#include <list> - -struct FrameRange -{ - FrameRange() - : in( -1 ), out( -1 ) - {} - - FrameRange( int in_, int out_ ) - : in( in_ ), out( out_ ) - {} - - bool isInValid() const - { - return in > 0; - } - - bool isValid() const - { - return isInValid() && out > 0; - } - - int length() const - { - return out - in; - } - - int in; - int out; -}; - -typedef std::list< FrameRange > FrameRangeList; Modified: cinesuite/cineplay-cinecode/trunk/src/olibs.pri =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/olibs.pri 2008-09-16 11:28:20 UTC (rev 189) +++ cinesuite/cineplay-cinecode/trunk/src/olibs.pri 2008-09-16 13:26:45 UTC (rev 190) @@ -16,7 +16,7 @@ # For now add any link flags from the environment LIBS += $(LDFLAGS) - DEFINES += HAVE_CONFIG_H + DEFINES += HAVE_GL_GLEW_H } win32 { Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/media.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/widgets/media.h 2008-09-16 11:28:20 UTC (rev 189) +++ cinesuite/cineplay-cinecode/trunk/src/widgets/media.h 2008-09-16 13:26:45 UTC (rev 190) @@ -8,6 +8,7 @@ #define JW_MEDIA_H #include "texture.h" + #include <openmedialib/ml/ml.hpp> #include <openassetlib/al/asset.hpp> Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp 2008-09-16 11:28:20 UTC (rev 189) +++ cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.cpp 2008-09-16 13:26:45 UTC (rev 190) @@ -5,9 +5,10 @@ // Released under the GPL. // For more information, see http://www.jahshaka.org. -#include "opengl_store.hpp" #include "mediaPtr.h" +#include "opengl_store.hpp" + // qt #include <QLayout> #include <QWheelEvent> Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.hpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.hpp 2008-09-16 11:28:20 UTC (rev 189) +++ cinesuite/cineplay-cinecode/trunk/src/widgets/opengl_store.hpp 2008-09-16 13:26:45 UTC (rev 190) @@ -7,12 +7,12 @@ #pragma once +// Must be included before any other GL headers +#include "shader_state.h" + #include "config.h" #include "widget_store.hpp" -// Must be included before any other GL headers -#include "shader_state.h" - // qt #include <QGLWidget> Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/shader_state.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/widgets/shader_state.cpp 2008-09-16 11:28:20 UTC (rev 189) +++ cinesuite/cineplay-cinecode/trunk/src/widgets/shader_state.cpp 2008-09-16 13:26:45 UTC (rev 190) @@ -1,3 +1,4 @@ + /* -*- mode: C; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */ // jahwidgets - A widget library representation. @@ -7,9 +8,16 @@ #include "shader_state.h" +// std +#include <cstring> + namespace jahwidgets { namespace qt3 { -void shader_state::init( const std::string& cg_vert, const std::string& cg_frag, const std::string& glsl_vert, const std::string& glsl_frag, bool prefix ) +void shader_state::init( const std::string& cg_vert, + const std::string& cg_frag, + const std::string& glsl_vert, + const std::string& glsl_frag, + bool prefix ) { #ifdef HAVE_CG_RUNTIME Cg_.init( cg_vert, cg_frag, prefix ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-09-16 09:16:34
|
Revision: 192 http://editopia.svn.sourceforge.net/editopia/?rev=192&view=rev Author: timdewhirst Date: 2008-09-16 16:16:09 +0000 (Tue, 16 Sep 2008) Log Message: ----------- cinesuite - more bug fixing - start placing items in resources Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/Command.cpp cinesuite/cineplay-cinecode/trunk/src/Common.cpp cinesuite/cineplay-cinecode/trunk/src/Player.cpp cinesuite/cineplay-cinecode/trunk/src/Player.h cinesuite/cineplay-cinecode/trunk/src/Utils.cpp cinesuite/cineplay-cinecode/trunk/src/config.pri Added Paths: ----------- cinesuite/cineplay-cinecode/trunk/src/resources/fg_all.xml cinesuite/cineplay-cinecode/trunk/src/resources/fg_flash.xml Removed Paths: ------------- cinesuite/cineplay-cinecode/trunk/src/fg_all.xml cinesuite/cineplay-cinecode/trunk/src/fg_flash.xml Modified: cinesuite/cineplay-cinecode/trunk/src/Command.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Command.cpp 2008-09-16 13:28:21 UTC (rev 191) +++ cinesuite/cineplay-cinecode/trunk/src/Command.cpp 2008-09-16 16:16:09 UTC (rev 192) @@ -97,7 +97,8 @@ void CommandQueue::waitForCommands() { m_mutex.lock(); - m_condition.wait( &m_mutex ); + m_condition.wait( &m_mutex, 1000 ); + m_mutex.unlock(); } } //namespace cineplay Modified: cinesuite/cineplay-cinecode/trunk/src/Common.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-09-16 13:28:21 UTC (rev 191) +++ cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-09-16 16:16:09 UTC (rev 192) @@ -467,7 +467,7 @@ bool audio_success = true; while( !m_audioStore ) { - DEBUG_LOG << "Common::SetupStores: creating audio store: " << storeTypeAudio.toStdString(); + DEBUG_LOG << "Common::SetupStores: creating audio store: " << storeTypeAudio.toStdString() << "\n"; if ( storeTypeAudio == "sdl" ) storeTypeAudio = "sdl_audio"; storeTypeAudio += ":"; Modified: cinesuite/cineplay-cinecode/trunk/src/Player.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Player.cpp 2008-09-16 13:28:21 UTC (rev 191) +++ cinesuite/cineplay-cinecode/trunk/src/Player.cpp 2008-09-16 16:16:09 UTC (rev 192) @@ -28,6 +28,7 @@ #include <QThread> #include <QMutex> #include <QWaitCondition> +#include <QString> #include <QDebug> // boost @@ -335,7 +336,7 @@ float volume() const; void setMute(bool on); bool isMute() const; - void load(const char *fname); + void load( const QString& fname ); void unload(); void seek(int frame, bool rel = false); void play(); @@ -515,8 +516,8 @@ //-------------------------------------------------------------------------------- - Player::Player(const ml::store_type_ptr &videoStore, const ml::store_type_ptr &audioStore) - : m_threadRunning(false) + Player::Player( const ml::store_type_ptr& videoStore, const ml::store_type_ptr& audioStore ) + : m_threadRunning( true ) , m_playing(false) , m_currentFrame(-1) , m_frameVelocity(0) @@ -528,7 +529,6 @@ , m_lastFrame(ml::frame_type_ptr()) , m_delay( audioStore->properties().get_property_with_string( "preroll" ).value< int >() ) { - DEBUG_LOG; start(); } @@ -645,9 +645,9 @@ return m_mute; } - void Player::load(const char *fname) + void Player::load( const QString& fname ) { - DEBUG_LOG << this << " loading: " << fname; + DEBUG_LOG << this << " loading: " << fname.toStdString(); m_commandQueue.postCommand( LoadCommand::create(this, fname) ); } @@ -785,11 +785,8 @@ void Player::run() { - DEBUG_LOG; - - { // lock scope - QMutexLocker lock( &m_mutex ); - m_threadRunning = true; + { + DEBUG_LOG << "starting player thread"; } do @@ -821,7 +818,11 @@ } } - } while(m_threadRunning); + } while( m_threadRunning ); + + { + DEBUG_LOG << "player thread terminating"; + } } Modified: cinesuite/cineplay-cinecode/trunk/src/Player.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Player.h 2008-09-16 13:28:21 UTC (rev 191) +++ cinesuite/cineplay-cinecode/trunk/src/Player.h 2008-09-16 16:16:09 UTC (rev 192) @@ -29,6 +29,8 @@ namespace il = olib::openimagelib::il; namespace pl = olib::openpluginlib; +class QString; + namespace cineplay { class IPlayer; @@ -117,7 +119,7 @@ virtual float volume() const = 0; virtual void setMute(bool on) = 0; virtual bool isMute() const = 0; - virtual void load(const char *fname) = 0; + virtual void load(const QString& fname) = 0; virtual void seek(int frame, bool rel = false) = 0; virtual void play() = 0; virtual void stop() = 0; Modified: cinesuite/cineplay-cinecode/trunk/src/Utils.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Utils.cpp 2008-09-16 13:28:21 UTC (rev 191) +++ cinesuite/cineplay-cinecode/trunk/src/Utils.cpp 2008-09-16 16:16:09 UTC (rev 192) @@ -289,7 +289,8 @@ pl::init( pluginPath.ascii(), 0 ); } #else - pl::init( QString( appDirPath + "/plugins" ).latin1(), 0 ); + // pl::init( QString( appDirPath + "/plugins" ).latin1(), 0 ); + pl::init(); #endif //Q_OS_MACX } Modified: cinesuite/cineplay-cinecode/trunk/src/config.pri =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/config.pri 2008-09-16 13:28:21 UTC (rev 191) +++ cinesuite/cineplay-cinecode/trunk/src/config.pri 2008-09-16 16:16:09 UTC (rev 192) @@ -1,6 +1,6 @@ CONFIG += qt warn_on -CONFIG += release console +CONFIG += debug console QT += xml network qt3support opengl win32 { Deleted: cinesuite/cineplay-cinecode/trunk/src/fg_all.xml =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/fg_all.xml 2008-09-16 13:28:21 UTC (rev 191) +++ cinesuite/cineplay-cinecode/trunk/src/fg_all.xml 2008-09-16 16:16:09 UTC (rev 192) @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<filterGraph> - - <var name="audioChannels">2</var> - <var name="audioFrequency">44100</var> - <var name="fps_num">25</var> - <var name="fps_den">1</var> - - <filter class="conform" name="conform"> - <property name="channels">audioChannels</property> - <property name="frequency">audioFrequency</property> - </filter> - - <filter class="resampler" name="resampler"> - <property name="channels">audioChannels</property> - <property name="frequency">audioFrequency</property> - </filter> - - <filter class="frame_rate" name="frame_rate"> - <property name="fps_num">fps_num</property> - <property name="fps_den">fps_den</property> - </filter> - - <filter class="composite" name="composite"> - <property name="swap">1</property> - </filter> - - <input class="colour" name="colour"> - <property name="r">0</property> - <property name="g">0</property> - <property name="b">0</property> - <property name="a">16</property> - <property name="sar_num">1</property> - <property name="sar_den">1</property> - <property name="fps_num">fps_num</property> - <property name="fps_den">fps_den</property> - <property name="width">input.frame.width</property> - <property name="height">input.frame.height</property> - </input> - - <store name="store"> - <property name="enable_audio">1</property> - <property name="enable_video">1</property> - <property name="acodec">adpcm_swf</property> - </store> - - - <connection from="input" to="conform"/> - <connection from="conform" to="resampler"/> - <connection from="resampler" to="frame_rate"/> - <connection from="colour" to="composite" index="1"/> - <connection from="frame_rate" to="composite" index="0"/> - <connection from="composite" to="store"/> - -</filterGraph> - - Deleted: cinesuite/cineplay-cinecode/trunk/src/fg_flash.xml =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/fg_flash.xml 2008-09-16 13:28:21 UTC (rev 191) +++ cinesuite/cineplay-cinecode/trunk/src/fg_flash.xml 2008-09-16 16:16:09 UTC (rev 192) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<filterGraph> - - <var name="audioChannels">2</var> - <var name="audioFrequency">44100</var> - - <filter class="resampler" name="resampler"> - <property name="channels">audioChannels</property> - <property name="frequency">audioFrequency</property> - </filter> - - <store name="store"> - <property name="enable_audio">1</property> - <property name="enable_video">1</property> - <property name="acodec">aac</property> - <property name="vcodec">h264</property> - <property name="qscale">8</property> - </store> - - <connection from="input" to="resampler"/> - <connection from="resampler" to="store"/> - -</filterGraph> - - Copied: cinesuite/cineplay-cinecode/trunk/src/resources/fg_all.xml (from rev 188, cinesuite/cineplay-cinecode/trunk/src/fg_all.xml) =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/resources/fg_all.xml (rev 0) +++ cinesuite/cineplay-cinecode/trunk/src/resources/fg_all.xml 2008-09-16 16:16:09 UTC (rev 192) @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<filterGraph> + + <var name="audioChannels">2</var> + <var name="audioFrequency">44100</var> + <var name="fps_num">25</var> + <var name="fps_den">1</var> + + <filter class="conform" name="conform"> + <property name="channels">audioChannels</property> + <property name="frequency">audioFrequency</property> + </filter> + + <filter class="resampler" name="resampler"> + <property name="channels">audioChannels</property> + <property name="frequency">audioFrequency</property> + </filter> + + <filter class="frame_rate" name="frame_rate"> + <property name="fps_num">fps_num</property> + <property name="fps_den">fps_den</property> + </filter> + + <filter class="composite" name="composite"> + <property name="swap">1</property> + </filter> + + <input class="colour" name="colour"> + <property name="r">0</property> + <property name="g">0</property> + <property name="b">0</property> + <property name="a">16</property> + <property name="sar_num">1</property> + <property name="sar_den">1</property> + <property name="fps_num">fps_num</property> + <property name="fps_den">fps_den</property> + <property name="width">input.frame.width</property> + <property name="height">input.frame.height</property> + </input> + + <store name="store"> + <property name="enable_audio">1</property> + <property name="enable_video">1</property> + <property name="acodec">adpcm_swf</property> + </store> + + + <connection from="input" to="conform"/> + <connection from="conform" to="resampler"/> + <connection from="resampler" to="frame_rate"/> + <connection from="colour" to="composite" index="1"/> + <connection from="frame_rate" to="composite" index="0"/> + <connection from="composite" to="store"/> + +</filterGraph> + + Copied: cinesuite/cineplay-cinecode/trunk/src/resources/fg_flash.xml (from rev 188, cinesuite/cineplay-cinecode/trunk/src/fg_flash.xml) =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/resources/fg_flash.xml (rev 0) +++ cinesuite/cineplay-cinecode/trunk/src/resources/fg_flash.xml 2008-09-16 16:16:09 UTC (rev 192) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<filterGraph> + + <var name="audioChannels">2</var> + <var name="audioFrequency">44100</var> + + <filter class="resampler" name="resampler"> + <property name="channels">audioChannels</property> + <property name="frequency">audioFrequency</property> + </filter> + + <store name="store"> + <property name="enable_audio">1</property> + <property name="enable_video">1</property> + <property name="acodec">aac</property> + <property name="vcodec">h264</property> + <property name="qscale">8</property> + </store> + + <connection from="input" to="resampler"/> + <connection from="resampler" to="store"/> + +</filterGraph> + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-09-17 03:25:04
|
Revision: 194 http://editopia.svn.sourceforge.net/editopia/?rev=194&view=rev Author: timdewhirst Date: 2008-09-17 10:25:00 +0000 (Wed, 17 Sep 2008) Log Message: ----------- cinesuite - resource.qrc file Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/common.pri Added Paths: ----------- cinesuite/cineplay-cinecode/trunk/src/resources/resources.qrc Modified: cinesuite/cineplay-cinecode/trunk/src/common.pri =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/common.pri 2008-09-16 21:03:48 UTC (rev 193) +++ cinesuite/cineplay-cinecode/trunk/src/common.pri 2008-09-17 10:25:00 UTC (rev 194) @@ -8,6 +8,8 @@ # Input +RESOURCES = resources/resources.qrc + macx { LIBS+= -framework Cocoa -framework CoreFoundation } Added: cinesuite/cineplay-cinecode/trunk/src/resources/resources.qrc =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/resources/resources.qrc (rev 0) +++ cinesuite/cineplay-cinecode/trunk/src/resources/resources.qrc 2008-09-17 10:25:00 UTC (rev 194) @@ -0,0 +1,79 @@ +<RCC> + <qresource prefix="/images" > + <file alias="arrows_left_active">arrows_left_active.png</file> + <file alias="arrows_left_normal">arrows_left_normal.png</file> + <file alias="arrows_right_active">arrows_right_active.png</file> + <file alias="arrows_right_normal">arrows_right_normal.png</file> + <file alias="audio_mute">audio_mute.png</file> + <file alias="audio_on">audio_on.png</file> + <file alias="back_active">back_active.png</file> + <file alias="back_normal">back_normal.png</file> + <file alias="forward_active">forward_active.png</file> + <file alias="forward_normal">forward_normal.png</file> + <file alias="end_active">end_active.png</file> + <file alias="end_normal">end_normal.png</file> + <file alias="pause_active">pause_active.png</file> + <file alias="pause_normal">pause_normal.png</file> + <file alias="play_active">play_active.png</file> + <file alias="play_normal">play_normal.png</file> + <file alias="start_active">start_active.png</file> + <file alias="start_normal">start_normal.png</file> + + <file alias="button_active">button_active.png</file> + <file alias="button_blue_active">button_blue_active.png</file> + <file alias="button_blue_normal">button_blue_normal.png</file> + <file alias="button_normal">button_normal.png</file> + + <file alias="cinecode_48">cinecode_48.png</file> + <file alias="cinecode_64">cinecode_64.png</file> + <file alias="cinecode_about">cinecode_about.png</file> + <file alias="cinecode_banner">cinecode_banner.png</file> + <file alias="cinefx_32">cinefx_32.png</file> + <file alias="cinefx">cinefx.png</file> + <file alias="cineplay_64">cineplay_64.png</file> + <file alias="cineplay_about">cineplay_about.png</file> + <file alias="cineplay_banner">cineplay_banner.png</file> + + <file alias="brightness_high">brightness-high.png</file> + <file alias="brightness_low">brightness-low.png</file> + <file alias="colour_high">colour-high.png</file> + <file alias="colour_low">colour-low.png</file> + <file alias="contrast_high">contrast-high.png</file> + <file alias="contrast_low">contrast-low.png</file> + <file alias="saturation_high">saturation-high.png</file> + <file alias="saturation_low">saturation-low.png</file> + <file alias="small_slider_thumb">small-slider-thumb.png</file> + <file alias="small_slider_tray">small-slider-tray.png</file> + + <file alias="led_disabled">led-disabled.png</file> + <file alias="led_green">led-green.png</file> + <file alias="led_red">led-red.png</file> + <file alias="led_yellow">led-yellow.png</file> + + <file alias="close_active">close_active.png</file> + <file alias="close_normal">close_normal.png</file> + <file alias="maximize_active">maximize_active.png</file> + <file alias="maximize_normal">maximize_normal.png</file> + <file alias="minimize_active">minimize_active.png</file> + <file alias="minimize_normal">minimize_normal.png</file> + + <file alias="stop-disabled">stop-disabled.png</file> + <file alias="stop-normal">stop-normal.png</file> + <file alias="play-disabled">play-disabled.png</file> + <file alias="play-normal">play-normal.png</file> + <file alias="pause-normal">pause-normal.png</file> + <file alias="pause-disabled">pause-disabled.png</file> + + <file alias="timeline_thumb_active">timeline_thumb_active.png</file> + <file alias="timeline_thumb_normal">timeline_thumb_normal.png</file> + <file alias="timeline_tray_elapsed">timeline_tray_elapsed.png</file> + <file alias="timeline_tray_empty">timeline_tray_empty.png</file> + <file alias="volume_thumb">volume_thumb.png</file> + <file alias="volume_tray">volume_tray.png</file> + </qresource> + <qresource prefix="/" > + <file alias="stylesheet">default.css</file> + <file alias="default_encoder">fg_all.xml</file> + <file alias="flash_encoder">fg_flash.xml</file> + </qresource> +</RCC> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-09-17 09:24:51
|
Revision: 197 http://editopia.svn.sourceforge.net/editopia/?rev=197&view=rev Author: timdewhirst Date: 2008-09-17 16:24:42 +0000 (Wed, 17 Sep 2008) Log Message: ----------- cinesuite - style updates; WIP; extremely broken at the moment - add of resource extraction helper Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp cinesuite/cineplay-cinecode/trunk/src/CinePlay.cpp cinesuite/cineplay-cinecode/trunk/src/Common.cpp cinesuite/cineplay-cinecode/trunk/src/common.pri cinesuite/cineplay-cinecode/trunk/src/resources/default.css cinesuite/cineplay-cinecode/trunk/src/windows/main_cinecode.ui cinesuite/cineplay-cinecode/trunk/src/windows/toolbar.ui Added Paths: ----------- cinesuite/cineplay-cinecode/trunk/src/ResourceUtil.cpp cinesuite/cineplay-cinecode/trunk/src/ResourceUtil.hpp Modified: cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp 2008-09-17 11:15:35 UTC (rev 196) +++ cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp 2008-09-17 16:24:42 UTC (rev 197) @@ -588,18 +588,17 @@ int main( int argc, char *argv[] ) { - // qInstallMsgHandler( LogMessageHandler ); + qInstallMsgHandler( LogMessageHandler ); QApplication a( argc, argv ); cineplay::CineCode* w = new cineplay::CineCode; - - a.setMainWidget( w ); if ( !w->init( a.arguments() ) ) return 1; - - DEBUG_LOG << "starting app"; + { + DEBUG_LOG << "starting app"; + } if( a.arguments().size() == 2 ) { Modified: cinesuite/cineplay-cinecode/trunk/src/CinePlay.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/CinePlay.cpp 2008-09-17 11:15:35 UTC (rev 196) +++ cinesuite/cineplay-cinecode/trunk/src/CinePlay.cpp 2008-09-17 16:24:42 UTC (rev 197) @@ -231,24 +231,18 @@ qInstallMsgHandler( LogMessageHandler ); QApplication::setColorSpec( QApplication::CustomColor ); - QApplication a( argc, argv ); + QApplication app( argc, argv ); - qInitNetworkProtocols(); + cineplay::CinePlay* w = new cineplay::CinePlay; - cineplay::CinePlay* app = new cineplay::CinePlay; - - a.setMainWidget( app ); - - QStringList args; - for( int i=0; i<argc; ++i ) - args.append( argv[i] ); - - if ( !app->init( &args ) ) + if ( !app->init( app.arguments() ) ) return 1; - DEBUG_LOG << "starting app"; + { + DEBUG_LOG << "starting app"; + } - if( args.size() == 2 ) + if( app.arguments().size() == 2 ) { if( !app->LoadCmdLineInput( args[1] ) ) return -1; Modified: cinesuite/cineplay-cinecode/trunk/src/Common.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-09-17 11:15:35 UTC (rev 196) +++ cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-09-17 16:24:42 UTC (rev 197) @@ -45,6 +45,7 @@ #include "log.h" #include "GridLayoutCallback.h" #include "about.h" +#include "ResourceUtil.hpp" // generated #include "ui_toolbar.h" @@ -275,6 +276,8 @@ { DEBUG_LOG; + m_parent->setStyleSheet( getResourceData( ":/stylesheet" ) ); + QStringList::const_iterator I = args.begin(); QStringList::const_iterator E = args.end(); while ( I != E ) @@ -340,7 +343,7 @@ if (m_checkRelease) onCheckVersion(); - //lastly before we show, load the last window pos + // finally before we show, load the last window pos int xPos = settings.readNumEntry( SETTINGS_WINDOWXPOS, 200 ); int yPos = settings.readNumEntry( SETTINGS_WINDOWYPOS, 200 ); m_parent->move (xPos, yPos ); Added: cinesuite/cineplay-cinecode/trunk/src/ResourceUtil.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/ResourceUtil.cpp (rev 0) +++ cinesuite/cineplay-cinecode/trunk/src/ResourceUtil.cpp 2008-09-17 16:24:42 UTC (rev 197) @@ -0,0 +1,43 @@ + +/* -*- mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */ + +// This file is part of Cineplay +// +// Cineplay is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// Cineplay is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +// +// Copyright (C) 2008 Audiotube Ltd. +// For more information, see http://www.audiotube.com + +#include "ResourceUtil.hpp" + +// qt +#include <QString> +#include <QResource> +#include <QDebug> + +QByteArray getResourceData( const QString& resource ) +{ + QResource res( resource ); + if ( !res.isValid() ) + { + qWarning() << "getResourceData: resource is invalid:" << resource; + return QByteArray(); + } + + QByteArray data( reinterpret_cast< const char* >(res.data()), res.size() ); + if ( res.isCompressed() ) + return qUncompress( data ); + + return data; +} Added: cinesuite/cineplay-cinecode/trunk/src/ResourceUtil.hpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/ResourceUtil.hpp (rev 0) +++ cinesuite/cineplay-cinecode/trunk/src/ResourceUtil.hpp 2008-09-17 16:24:42 UTC (rev 197) @@ -0,0 +1,29 @@ + +/* -*- mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */ + +// This file is part of Cineplay +// +// Cineplay is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// Cineplay is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +// +// Copyright (C) 2008 Audiotube Ltd. +// For more information, see http://www.audiotube.com + +#pragma once + +// qt +#include <QByteArray> + +class QString; + +QByteArray getResourceData( const QString& resource ); Modified: cinesuite/cineplay-cinecode/trunk/src/common.pri =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/common.pri 2008-09-17 11:15:35 UTC (rev 196) +++ cinesuite/cineplay-cinecode/trunk/src/common.pri 2008-09-17 16:24:42 UTC (rev 197) @@ -52,7 +52,8 @@ GridLayoutCallback.h \ Geometry.hpp \ Lerp.hpp \ - about.h + about.h \ + ResourceUtil.hpp SOURCES += \ Common.cpp \ @@ -76,5 +77,5 @@ ScrollViewResizer.cpp \ GridLayoutCallback.cpp \ Geometry.cpp \ - about.cpp - + about.cpp \ + ResourceUtil.cpp Modified: cinesuite/cineplay-cinecode/trunk/src/resources/default.css =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/resources/default.css 2008-09-17 11:15:35 UTC (rev 196) +++ cinesuite/cineplay-cinecode/trunk/src/resources/default.css 2008-09-17 16:24:42 UTC (rev 197) @@ -1,7 +1,15 @@ -#mainwindow { +QWidget { background: #363636; } +#minimize { + background-image: url( ":/images/minimize_normal" ); +} + +QPushButton#encode_main { + background-image: url( ":/images/button_normal" ); +} + #windowbar { background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop: 0 #424242, stop: 1 #363636); @@ -37,100 +45,6 @@ border: none; } -QTabBar::tab { - border-width: 1px; - border-style: solid; - min-width: 80px; - padding-top: 2px; - padding-bottom: 2px; - margin-left: 6px; - margin-right: 6px; - margin-top: 3px; - margin-bottom: 4px; - - font-family: "Helvetica"; - font-weight: bold; - font-size: 11px; -} - -QTabBar::tab:selected { - color: #000000; - background: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop: 0 #dee6c1, stop: 1 #c9d6a0); - border-color: #c9d6a0; - - /* equals the padding-bottom + margin-bottom of an unselected tab */ - padding-bottom: 6px; - - margin-bottom: 0px; - border-top-left-radius: 3px; - border-top-right-radius: 3px; -} - -QTabBar::tab:!selected { - color: #acacac; - background: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop: 0 #393737, stop: 1 #231f20); - border-color: #939393; - border-radius: 3px; -} - -QTabBar::scroller -{ - width: 18px; -} - -QTabBar QToolButton -{ - background: none; - border: none; - min-height: 20px; - min-width: 18px; - margin: 0px; - padding: 0px; -} - -QTabBar QToolButton::left-arrow { - image: url(:/tabbar-left.png); -} - -QTabBar QToolButton::right-arrow { - image: url(:/tabbar-right.png); -} - -#treeview { - border-style: none; - font-size: 15px; - font-weight: bold; - font-family: "Helvetica"; -} - -#treeview::item { - padding-top: 9px; - padding-bottom: 9px; -} - -#treeview::indicator:unchecked { - image: none; -} - -/* "!unchecked" works but "checked" doesn't, hmm. */ -#treeview::indicator:!unchecked { - image: url(:/done-check-mark.png); -} - -#treeview::branch:!adjoins-item { - image: none; -} - -#treeview::branch:adjoins-item:!selected { - image: url(:/bullet-unselected.png); -} - -#treeview::branch:adjoins-item:selected { - image: url(:/bullet-selected.png); -} - QScrollBar:vertical { background: black; width: 14px; @@ -290,243 +204,3 @@ stop: 0.7 #7c8e42 stop: 1.0 #9cb257 ); } - -UpdatesDialog { - min-height: 140px; -} - -UpdatesDialog #progressbar { - min-width: 216px; -} - -SyncDialog #progressbar { - min-width: 200px; -} - -StartSyncDialog #bigtextlabel { - font-size: 17px; -} - -LicenceDialog -{ - min-width: 394px; - max-width: 394px; - min-height: 193px; - max-height: 193px; -} - -LicenceDialog #bigtextlabel { - font-size: 15px; -} - -PrefsDialog #tabs::pane { - border-width: 2px; - border-style: solid; - border-color: #c9d6a0; -} - -PrefsDialog #sectionlabel { - font-size: 9px; - border-bottom-width: 2px; - border-bottom-style: solid; - border-bottom-color: #bbbbbb; -} - -PrefsDialog #greentitle { - color: #1b8d00; -} - -PrefsDialog #localsyncbutton, PrefsDialog #remotesyncbutton { - color: white; - background: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop: 0 #393737, stop: 1 #231f20); - border-color: #939393; - border-style: solid; - border-width: 1px; - border-radius: 3px; - - padding: 3px; - margin: 5px; -} - -PrefsDialog #separator { - min-height: 1px; /* seems to be needed to make it show up */ - border-style: none; - border-bottom-style: solid; - border-bottom-width: 2px; - border-bottom-color: #bbbbbb; -} - -PrefsDialog #testconnectionbutton { - border: none; -} - -PrefsDialog #testconnectionlabel, PrefsDialog #unlocklabel { - color: white; - font-size: 9px; -} - -ChatWindow #inputedit { - min-height: 30px; - max-height: 30px; -} - -ChatWindow ToolButton { - border-style: none; -} - -FriendsWidgetScroll -{ - border: none; -} - -FriendsWidget -{ - background: #c9d6a0; -} - -FriendsWidget #avatarlabel -{ - border-style: solid; - border-color: black; - border-width: 3px; - border-radius: 4px; -} - -FriendsWidget QLabel -{ - font-family: "Helvetica"; - font-weight: bold; - font-size: 12px; -} - -FriendWidget -{ - background: #c9d6a0; - border-style: solid; - border-top-width: 0px; - border-left-width: 0px; - border-right-width: 0px; - border-bottom-width: 1px; - border-bottom-color: #dee6c1; -} - -FriendsContainer #topbar { - border: none; -} - -/* sizes of the buttons and pseudotab are to mimic the lists tab -widget. Not all values are the same though - does an extra border -get in somewhere? -*/ - -FriendsContainer #topbar QToolButton { - min-width: 80px; - - border-width: 1px; - border-style: solid; - - padding-top: 0px; - padding-bottom: 0px; - - margin-left: 6px; - margin-right: 6px; - margin-top: 3px; - margin-bottom: 2px; - - font-family: "Helvetica"; - font-weight: bold; - font-size: 11px; - - color: #acacac; - background: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop: 0 #393737, stop: 1 #231f20); - - border-color: #939393; - border-radius: 3px; -} - -FriendsContainer #presencebutton { - padding-right: 12px; /* prevent text being squashed against arrow */ -} - -FriendsContainer #pseudotab { - min-width: 80px; - - border-width: 1px; - border-style: solid; - - padding-top: 1px; - padding-bottom: 4px; - - margin-left: 6px; - margin-right: 6px; - margin-top: 3px; - margin-bottom: 0px; - - font-family: "Helvetica"; - font-weight: bold; - font-size: 11px; - - color: #000000; - background: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop: 0 #dee6c1, stop: 1 #c9d6a0); - border-color: #c9d6a0; - - border-top-left-radius: 3px; - border-top-right-radius: 3px; -} - -#mainwindow #bottombar #addfriendbutton, #mainwindow #bottombar #viewbutton { - /* sizing and positioning of these are arranged to match the pairs - of list +/- and task up/down buttons */ - - min-width: 58px; - max-width: 58px; - min-height: 20px; - max-height: 20px; - - border-width: 1px; - border-style: solid; - border-color: #939393; - border-radius: 3px; - - margin-left: 1px; - margin-right: 2px; - margin-top: 0px; - margin-bottom: 1px; - - color: #acacac; - background: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop: 0 #393737, stop: 1 #231f20); -} - -DisconnectedFriendsWidget { - background-color: #c9d6a0; -} - -DisconnectedFriendsWidget QWidget { - font-family: "Helvetica"; - font-weight: bold; - font-size: 12px; -} - -DisconnectedFriendsWidget #connectbutton { - color: white; - background: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop: 0.0 #b8c888, - stop: 0.6 #a1b661 - stop: 0.7 #7c8e42 - stop: 1.0 #9cb257 ); - border-width: 1px; - border-style: solid; - border-color: black; - border-radius: 4px; - - padding-left: 5px; - padding-right: 5px; -} - -DisconnectedFriendsWidget #connectbutton:!enabled { - background: #dddddd; -} Modified: cinesuite/cineplay-cinecode/trunk/src/windows/main_cinecode.ui =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/windows/main_cinecode.ui 2008-09-17 11:15:35 UTC (rev 196) +++ cinesuite/cineplay-cinecode/trunk/src/windows/main_cinecode.ui 2008-09-17 16:24:42 UTC (rev 197) @@ -23,7 +23,7 @@ <number>0</number> </property> <item> - <widget class="Q3Frame" name="titlebar" > + <widget class="QFrame" name="titlebar" > <property name="sizePolicy" > <sizepolicy vsizetype="Minimum" hsizetype="Expanding" > <horstretch>0</horstretch> @@ -53,7 +53,7 @@ <number>0</number> </property> <item> - <widget class="Q3Frame" name="titlebar_left" > + <widget class="QFrame" name="titlebar_left" > <property name="sizePolicy" > <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > <horstretch>0</horstretch> @@ -81,7 +81,7 @@ </widget> </item> <item> - <widget class="Q3Frame" name="titlebar_center" > + <widget class="QFrame" name="titlebar_center" > <property name="sizePolicy" > <sizepolicy vsizetype="Minimum" hsizetype="Preferred" > <horstretch>0</horstretch> @@ -283,7 +283,7 @@ </widget> </item> <item> - <widget class="Q3Frame" name="titlebar_right" > + <widget class="QFrame" name="titlebar_right" > <property name="sizePolicy" > <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > <horstretch>0</horstretch> @@ -322,7 +322,7 @@ <number>0</number> </property> <item> - <widget class="Q3Frame" name="frame16" > + <widget class="QFrame" name="frame16" > <property name="sizePolicy" > <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > <horstretch>0</horstretch> @@ -361,7 +361,7 @@ <number>0</number> </property> <item> - <widget class="Q3Frame" name="menubar_placeholder" > + <widget class="QFrame" name="menubar_placeholder" > <property name="sizePolicy" > <sizepolicy vsizetype="Minimum" hsizetype="Preferred" > <horstretch>0</horstretch> @@ -425,7 +425,7 @@ </widget> </item> <item> - <widget class="Q3Frame" name="menubar" > + <widget class="QFrame" name="menubar" > <property name="frameShape" > <enum>QFrame::NoFrame</enum> </property> @@ -475,7 +475,7 @@ </widget> </item> <item> - <widget class="Q3Frame" name="store_placeholder" > + <widget class="QFrame" name="store_placeholder" > <property name="sizePolicy" > <sizepolicy vsizetype="Expanding" hsizetype="Expanding" > <horstretch>0</horstretch> @@ -496,7 +496,7 @@ </layout> </item> <item> - <widget class="Q3Frame" name="frame17" > + <widget class="QFrame" name="frame17" > <property name="sizePolicy" > <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > <horstretch>0</horstretch> @@ -529,7 +529,7 @@ </layout> </item> <item> - <widget class="Q3Frame" name="toolbar_placeholder" > + <widget class="QFrame" name="toolbar_placeholder" > <property name="sizePolicy" > <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > <horstretch>0</horstretch> @@ -556,14 +556,6 @@ </layout> </widget> <layoutdefault spacing="6" margin="11" /> - <customwidgets> - <customwidget> - <class>Q3Frame</class> - <extends>QFrame</extends> - <header>Qt3Support/Q3Frame</header> - <container>1</container> - </customwidget> - </customwidgets> <resources/> <connections/> </ui> Modified: cinesuite/cineplay-cinecode/trunk/src/windows/toolbar.ui =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/windows/toolbar.ui 2008-09-17 11:15:35 UTC (rev 196) +++ cinesuite/cineplay-cinecode/trunk/src/windows/toolbar.ui 2008-09-17 16:24:42 UTC (rev 197) @@ -142,16 +142,16 @@ <bool>false</bool> </property> <property name="thumb" stdset="0" > - <pixmap>image1</pixmap> + <pixmap resource="../resources/resources.qrc" >:/images/timeline_thumb_normal</pixmap> </property> <property name="thumbActive" stdset="0" > - <pixmap>image2</pixmap> + <pixmap resource="../resources/resources.qrc" >:/images/timeline_thumb_active</pixmap> </property> <property name="tray" stdset="0" > - <pixmap>image3</pixmap> + <pixmap resource="../resources/resources.qrc" >:/images/timeline_tray_empty</pixmap> </property> <property name="elapsed" stdset="0" > - <pixmap>image4</pixmap> + <pixmap resource="../resources/resources.qrc" >:/images/timeline_tray_elapsed</pixmap> </property> <property name="inThumb" stdset="0" > <pixmap>image5</pixmap> @@ -338,7 +338,7 @@ </spacer> </item> <item> - <widget class="jahwidgets::qt3::Slider" native="1" name="volume" > + <widget class="QSlider" name="volume" > <property name="minimumSize" > <size> <width>50</width> @@ -351,18 +351,15 @@ <height>32767</height> </size> </property> - <property name="value" stdset="0" > + <property name="value" > <number>50</number> </property> + <property name="orientation" > + <enum>Qt::Horizontal</enum> + </property> <property name="maxValue" stdset="0" > <number>100</number> </property> - <property name="thumb" stdset="0" > - <pixmap>image10</pixmap> - </property> - <property name="tray" stdset="0" > - <pixmap>image11</pixmap> - </property> </widget> </item> <item> @@ -464,6 +461,17 @@ <property name="text" > <string/> </property> + <property name="icon" > + <iconset resource="../resources/resources.qrc" > + <normaloff>:/images/back_normal</normaloff> + <activeoff>:/images/back_active</activeoff>:/images/back_normal</iconset> + </property> + <property name="iconSize" > + <size> + <width>39</width> + <height>48</height> + </size> + </property> <property name="autoRepeat" > <bool>true</bool> </property> @@ -507,6 +515,22 @@ <property name="text" > <string/> </property> + <property name="icon" > + <iconset resource="../resources/resources.qrc" > + <normaloff>:/images/play_normal</normaloff> + <normalon>:/images/pause_normal</normalon> + <activeoff>:/images/play_active</activeoff> + <activeon>:/images/pause_active</activeon>:/images/play_normal</iconset> + </property> + <property name="iconSize" > + <size> + <width>46</width> + <height>48</height> + </size> + </property> + <property name="checkable" > + <bool>true</bool> + </property> <property name="flat" > <bool>true</bool> </property> @@ -520,7 +544,7 @@ <widget class="QPushButton" name="step_fwd" > <property name="geometry" > <rect> - <x>117</x> + <x>118</x> <y>1</y> <width>39</width> <height>48</height> @@ -550,6 +574,20 @@ <property name="text" > <string/> </property> + <property name="icon" > + <iconset resource="../resources/resources.qrc" > + <normaloff>:/images/forward_normal</normaloff> + <activeoff>:/images/forward_active</activeoff>:/images/forward_normal</iconset> + </property> + <property name="iconSize" > + <size> + <width>39</width> + <height>48</height> + </size> + </property> + <property name="checkable" > + <bool>false</bool> + </property> <property name="autoRepeat" > <bool>true</bool> </property> @@ -593,6 +631,17 @@ <property name="text" > <string/> </property> + <property name="icon" > + <iconset resource="../resources/resources.qrc" > + <normaloff>:/images/start_normal</normaloff> + <activeoff>:/images/start_active</activeoff>:/images/start_normal</iconset> + </property> + <property name="iconSize" > + <size> + <width>39</width> + <height>48</height> + </size> + </property> <property name="flat" > <bool>true</bool> </property> @@ -630,6 +679,20 @@ <property name="text" > <string/> </property> + <property name="icon" > + <iconset resource="../resources/resources.qrc" > + <normaloff>:/images/end_normal</normaloff> + <activeoff>:/images/end_active</activeoff>:/images/end_normal</iconset> + </property> + <property name="iconSize" > + <size> + <width>39</width> + <height>48</height> + </size> + </property> + <property name="autoRepeat" > + <bool>false</bool> + </property> <property name="flat" > <bool>true</bool> </property> @@ -815,11 +878,6 @@ <layoutdefault spacing="0" margin="0" /> <customwidgets> <customwidget> - <class>jahwidgets::qt3::Slider</class> - <extends>QWidget</extends> - <header>slider.h</header> - </customwidget> - <customwidget> <class>jahwidgets::qt3::TimelineSlider</class> <extends>QWidget</extends> <header>timelineSlider.h</header> @@ -829,6 +887,8 @@ <include location="local" >timelineSlider.h</include> <include location="local" >slider.h</include> </includes> - <resources/> + <resources> + <include location="../resources/resources.qrc" /> + </resources> <connections/> </ui> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-09-18 02:11:10
|
Revision: 198 http://editopia.svn.sourceforge.net/editopia/?rev=198&view=rev Author: timdewhirst Date: 2008-09-18 09:11:06 +0000 (Thu, 18 Sep 2008) Log Message: ----------- cinesuite - more work on styling; less broken now for cinecode Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp cinesuite/cineplay-cinecode/trunk/src/SetupDefs.h cinesuite/cineplay-cinecode/trunk/src/resources/close_active.png cinesuite/cineplay-cinecode/trunk/src/resources/close_normal.png cinesuite/cineplay-cinecode/trunk/src/resources/default.css cinesuite/cineplay-cinecode/trunk/src/resources/maximize_active.png cinesuite/cineplay-cinecode/trunk/src/resources/maximize_normal.png cinesuite/cineplay-cinecode/trunk/src/resources/minimize_active.png cinesuite/cineplay-cinecode/trunk/src/resources/minimize_normal.png cinesuite/cineplay-cinecode/trunk/src/windows/main_cinecode.ui cinesuite/cineplay-cinecode/trunk/src/windows/toolbar.ui Removed Paths: ------------- cinesuite/cineplay-cinecode/trunk/src/resource.h Modified: cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp 2008-09-17 16:24:42 UTC (rev 197) +++ cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp 2008-09-18 09:11:06 UTC (rev 198) @@ -116,6 +116,9 @@ if ( !m_impl->init( args ) ) return false; + // setup UI + ui.banner->setPixmap( QPixmap( ":/images/cinecode_banner" ) ); + // trays... // encoding/favourites tray... { Modified: cinesuite/cineplay-cinecode/trunk/src/SetupDefs.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/SetupDefs.h 2008-09-17 16:24:42 UTC (rev 197) +++ cinesuite/cineplay-cinecode/trunk/src/SetupDefs.h 2008-09-18 09:11:06 UTC (rev 198) @@ -81,7 +81,7 @@ #define WIDGET_STOREPLACE "store_placeholder" #define WIDGET_STORE "store" #define WIDGET_TOOLBARPLACE "toolbar_placeholder" -#define WIDGET_TITLEBAR "titlebar_center" +#define WIDGET_TITLEBAR "titlebar" #define WIDGET_MENUBAR "menubar" #define WIDGET_MENUBARPLACE "menubar_placeholder" Deleted: cinesuite/cineplay-cinecode/trunk/src/resource.h =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/resource.h 2008-09-17 16:24:42 UTC (rev 197) +++ cinesuite/cineplay-cinecode/trunk/src/resource.h 2008-09-18 09:11:06 UTC (rev 198) @@ -1,14 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by CinePlay1.rc - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 101 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif Modified: cinesuite/cineplay-cinecode/trunk/src/resources/close_active.png =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/resources/close_active.png 2008-09-17 16:24:42 UTC (rev 197) +++ cinesuite/cineplay-cinecode/trunk/src/resources/close_active.png 2008-09-18 09:11:06 UTC (rev 198) @@ -1,267 +1,9 @@ -/* XPM */ -static char *dummy[]={ -"26 32 232 2", -"bL c #313031", -".g c #333333", -".C c #343434", -"#S c #363636", -".P c #373636", -"#B c #373737", -".D c #383737", -"#i c #383838", -".1 c #393838", -".2 c #393a3a", -".L c #3a3939", -".N c #3a3b3b", -".A c #3b3c3c", -".t c #3c3d3d", -"#g c #3d3c3c", -"bt c #3d3d3e", -".r c #3d3e3e", -".m c #3e3f3f", -".E c #3f3d3d", -".Q c #3f3e3e", -".j c #3f4040", -".y c #403e3e", -".K c #403f3e", -".h c #404141", -".d c #414141", -".# c #414242", -".0 c #424040", -"Qt c #424343", -".4 c #454343", -".a c #454646", -".f c #464748", -".R c #484645", -"#k c #484646", -".Z c #4a4847", -"#z c #4b4948", -".i c #4b4c4d", -".l c #4d4d4d", -".5 c #4e4c4c", -".S c #4f4d4c", -".Y c #504e4e", -"#f c #514e4e", -"#l c #535050", -".T c #545252", -"#D c #555252", -"#y c #555352", -".X c #565353", -".6 c #575454", -"#R c #585555", -"#e c #585656", -".k c #595959", -".v c #5a5959", -"#m c #5c5959", -".7 c #5d5a5a", -"#x c #5e5b5b", -"#d c #5f5c5c", -"#U c #605d5d", -"#Q c #615f5f", -"#7 c #626060", -".z c #626160", -".8 c #636060", -"#n c #646161", -"#c c #646262", -"#w c #656363", -".9 c #686565", -"#E c #686566", -"#b c #686666", -".F c #686766", -"#P c #6a6767", -"#o c #6a6868", -"#v c #6c6969", -"#6 c #6c696a", -"aj c #6c6a6a", -"#F c #6f6d6d", -"#p c #706d6e", -".b c #707274", -"#u c #716e6f", -".I c #716f6e", -"#O c #716f6f", -"am c #726f70", -"#V c #727070", -".e c #727376", -"a. c #737171", -"#q c #747172", -"#5 c #747272", -"#t c #747273", -"ai c #757373", -"#G c #757374", -"#N c #767575", -"az c #787777", -".U c #797777", -"#W c #797778", -"#H c #7a7879", -"#4 c #7a7979", -"aN c #7a797a", -"a# c #7b7979", -"#M c #7b797a", -"ah c #7c7b7b", -"aQ c #7e7c7d", -"#X c #7e7d7d", -"#3 c #7f7e7f", -"aA c #807f80", -".p c #808080", -".c c #808285", -"aa c #817f80", -"an c #818081", -"a5 c #818181", -".s c #818386", -"ag c #828182", -"aw c #838283", -"bd c #838384", -".u c #838588", -"aR c #858485", -".x c #858584", -".B c #86888b", -"#. c #878585", -"a3 c #878688", -"aB c #878788", -".M c #87898c", -"aM c #88888a", -"a6 c #89898a", -".O c #8a8c8f", -"bc c #8b8b8d", -".J c #8c8b8b", -"aS c #8c8c8d", -"bg c #8c8c8e", -"bl c #8c8e8f", -"aC c #8d8d8e", -"a2 c #8d8d8f", -"bs c #8d8e90", -".3 c #8d8f92", -"aL c #8e8e90", -"#h c #8e9093", -"#r c #8f8e8e", -"a7 c #8f9092", -"bb c #909193", -".H c #918f8f", -"aT c #919193", -"bf c #919293", -"ad c #919294", -"#j c #919295", -"bK c #919394", -"#A c #919396", -"a1 c #929295", -"bh c #929395", -"bj c #939496", -"bn c #939497", -"a8 c #949597", -"aU c #949598", -"#C c #949699", -"#I c #959495", -"ao c #959596", -"aq c #959698", -"as c #959699", -"ar c #969799", -"bi c #96989a", -"a9 c #97989a", -"bo c #97989b", -"aF c #97999b", -"#T c #97999c", -"aI c #98999b", -"br c #98999c", -"aG c #989a9c", -"#8 c #989a9d", -".W c #999797", -"#Y c #999899", -"aH c #999a9d", -"ba c #999b9d", -"bp c #999b9e", -"aW c #9a9b9e", -"aZ c #9a9c9e", -"aX c #9a9c9f", -"#9 c #9b9c9f", -"aY c #9b9d9f", -"ak c #9b9da0", -"ab c #9c9b9c", -"b. c #9c9da0", -"b# c #9c9ea1", -"bq c #9d9fa2", -"al c #9da0a2", -"av c #9e9e9f", -"ax c #9ea0a3", -"ay c #a0a2a5", -"#0 c #a1a1a3", -"aO c #a1a3a5", -"aP c #a3a5a7", -"#a c #a4a2a2", -"a0 c #a4a6a8", -"a4 c #a5a7a9", -"ae c #a6a6a8", -"bm c #a6a8aa", -"be c #a7a9ab", -"bk c #a8aaac", -"#s c #a9a8a8", -"at c #a9a9ab", -"aJ c #aaabad", -"aV c #abacae", -"#L c #aeadad", -"#2 c #b1b0b1", -"bu c #b2b4b6", -"af c #b3b2b3", -".n c #b3b3b3", -"bJ c #b3b5b7", -"bv c #b6b8ba", -"#Z c #b7b7b8", -"bI c #b7b9bb", -"ac c #babbbc", -"bw c #bbbdbf", -"bH c #bcbebf", -"ap c #bdbdbf", -"aE c #bebec0", -"bx c #bec1c2", -"bG c #bfc1c3", -"by c #c2c4c5", -"bz c #c5c7c8", -"bF c #c6c7c8", -"bA c #c8caca", -"bE c #c9cacb", -"bB c #cbcccd", -"bD c #cccdce", -"bC c #cdcecf", -"aD c #d6d6d7", -".q c #f2f2f2", -".w c #f3f3f3", -".G c #f4f4f4", -".V c #f5f5f5", -"## c #f6f6f6", -"#J c #f7f7f7", -"#K c #f8f7f8", -"#1 c #f8f8f8", -"au c #f8f8f9", -"aK c #f9f9f9", -".o c #ffffff", -"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", -".#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#", -".#.#.a.b.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.b.a.#.#", -".d.d.b.e.f.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.#.e.b.d.d", -".h.h.c.i.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.#.c.h.h", -".j.j.c.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.c.j.j", -".j.j.c.g.g.g.g.g.k.g.g.g.g.g.g.g.g.l.g.g.g.g.g.c.j.j", -".m.m.c.g.g.g.g.n.o.p.g.g.g.g.g.g.k.q.n.g.g.g.g.c.m.m", -".r.r.c.g.g.g.l.q.o.o.p.g.g.g.g.k.q.o.o.k.g.g.g.s.r.r", -".t.t.u.g.g.g.g.v.w.o.o.x.y.y.z.q.o.o.p.g.g.g.g.u.t.t", -".A.A.B.g.g.C.D.E.F.G.o.o.H.I.G.o.o.J.K.L.C.g.g.M.A.A", -".N.N.O.g.P.Q.R.S.T.U.V.o.o.V.o.o.W.X.Y.Z.0.1.g.O.N.N", -".2.2.3.L.4.5.6.7.8.9#.##.o.o.o#a#b#c#d#e#f.R#g#h.2.2", -"#i#i#j#k#l#m#n#o#p#q#r##.o.o.o#s#t#u#v#w#x#y#z#A#i#i", -"#B#B#C#D#d#E#F#G#H#I#J.o.o#K.o.o#L#M#N#O#P#Q#R#C#B#B", -"#S#S#T#U#P#V#W#X#Y#J.o.o#Z#0#1.o.o#2#3#4#5#6#7#8#S#S", -"#S#S#9#Pa.a#aaab#J.o.oacadadae#1.o.oafagahaiajak#S#S", -"#S#Salam#4anao#1.o.oapaqararasatau.o.oavawah#tax#S#S", -"#S#SayazaAaBaCaD.oaEaFaG#8aHaGaIaJaKaDaLaMagaNaO#S#S", -"#S#SaPaQaRaSaTaUaVaGaWaXaYaYaXaZaHa0aqa1a2a3#3aP#S#S", -"#S#Sa4a5a6a7a8a9aHaXakb.b#b#b.b.#9baaFaUbbbcbda4#S#S", -"#S#SbebfbgbharaGaXb.b#b#b#b#b#b#b.#9aHbibjaLaLbk#S#S", -"#S#Sblbma9bnbobpakb#b#bqbqbqbqb#b#b.aZbraUarbebs#S#S", -"#S#SbtadbubvbwbxbybzbAbBbCbCbDbEbFbybGbHbIbJbK.r#S#S", -"#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S", -"#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S", -"#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S", -"#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S#S", -"bLbLbLbLbLbLbLbLbLbLbLbLbLbLbLbLbLbLbLbLbLbLbLbLbLbL"}; +\x89PNG + + |
From: <tim...@us...> - 2008-09-18 03:11:58
|
Revision: 199 http://editopia.svn.sourceforge.net/editopia/?rev=199&view=rev Author: timdewhirst Date: 2008-09-18 10:11:54 +0000 (Thu, 18 Sep 2008) Log Message: ----------- cinesuite - more css/ui changes; mainly filters tray Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/Common.cpp cinesuite/cineplay-cinecode/trunk/src/Tray.cpp cinesuite/cineplay-cinecode/trunk/src/resources/brightness-high.png cinesuite/cineplay-cinecode/trunk/src/resources/default.css cinesuite/cineplay-cinecode/trunk/src/windows/filters.ui cinesuite/cineplay-cinecode/trunk/src/windows/main_cinecode.ui cinesuite/cineplay-cinecode/trunk/src/windows/tray.ui Modified: cinesuite/cineplay-cinecode/trunk/src/Common.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-09-18 09:11:06 UTC (rev 198) +++ cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-09-18 10:11:54 UTC (rev 199) @@ -184,7 +184,6 @@ #endif m_menubar = new QMenuBar( menubarPlaceholder ); - m_menubar->setPalette( menubarPlaceholder->palette() ); // file m_fileMenu = new QMenu( m_menubar ); Modified: cinesuite/cineplay-cinecode/trunk/src/Tray.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Tray.cpp 2008-09-18 09:11:06 UTC (rev 198) +++ cinesuite/cineplay-cinecode/trunk/src/Tray.cpp 2008-09-18 10:11:54 UTC (rev 199) @@ -48,11 +48,7 @@ break; case LOCATION_LEFT: - ui.right_vertical->hide(); - break; - default: - ui.left_vertical->hide(); break; } Modified: cinesuite/cineplay-cinecode/trunk/src/resources/default.css =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/resources/default.css 2008-09-18 09:11:06 UTC (rev 198) +++ cinesuite/cineplay-cinecode/trunk/src/resources/default.css 2008-09-18 10:11:54 UTC (rev 199) @@ -1,7 +1,13 @@ QWidget { - background: #363636; + color: white; } +#Main, #tray { + /*background: #363636;*/ + background: qlineargradient( x1:0, y1:0, x2:0, y2:1, + stop: 0 #424242, stop: 1 #181818); +} + QFrame { border-style: none; } @@ -15,7 +21,54 @@ stop: 0 #424242, stop: 1 #363636); } -#toggle_left_tray { +#filters { + background: #f8f8f8; +} + +#brightness_low, #brightness_high, +#contrast_low, #contrast_high, +#hue_low, #hue_high, +#saturation_low, #saturation_high +{ + min-width: 17px; + max-width: 17px; + min-height: 17px; + max-height: 17px; +} + +#brightness_low { + background-image: url(":/images/brightness_low"); +} + +#brightness_high { + background-image: url(":/images/brightness_high"); +} + +#contrast_low { + background-image: url(":/images/contrast_low"); +} + +#contrast_high { + background-image: url(":/images/contrast_high"); +} + +#hue_low { + background-image: url(":/images/colour_low"); +} + +#hue_high { + background-image: url(":/images/colour_high"); +} + +#saturation_low { + background-image: url(":/images/saturation_low"); +} + +#saturation_high { + background-image: url(":/images/saturation_high"); +} + +#toggle_left_tray, #toggle_right_tray:checked { background-image: url(":/images/arrows_left_normal"); min-width: 26px; max-width: 26px; @@ -23,11 +76,11 @@ max-height: 26px; } -#toggle_left_tray:hover { +#toggle_left_tray:hover, #toggle_right_tray:hover:checked { background-image: url(":/images/arrows_left_active"); } -#toggle_right_tray { +#toggle_right_tray, #toggle_left_tray:checked { background-image: url(":/images/arrows_right_normal"); min-width: 26px; max-width: 26px; @@ -35,7 +88,7 @@ max-height: 26px; } -#toggle_right_tray:hover { +#toggle_right_tray:hover, #toggle_left_tray:hover:checked { background-image: url(":/images/arrows_right_active"); } @@ -75,15 +128,22 @@ background-image: url(":/images/close_active"); } -QPushButton#encode_main { +QPushButton#encode_main, +QPushButton#favorites, +QPushButton#clear, +QPushButton#encode +{ background-image: url(":/images/button_normal"); - color: white; min-width: 80px; max-width: 80px; min-height: 26px; max-height: 26px; } -QPushButton#encode_main:hover { +QPushButton#encode_main:hover, +QPushButton#favorites:hover, +QPushButton#clear:hover, +QPushButton#encode:hover +{ background-image: url(":/images/button_active"); } Modified: cinesuite/cineplay-cinecode/trunk/src/windows/filters.ui =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/windows/filters.ui 2008-09-18 09:11:06 UTC (rev 198) +++ cinesuite/cineplay-cinecode/trunk/src/windows/filters.ui 2008-09-18 10:11:54 UTC (rev 199) @@ -5,7 +5,7 @@ <rect> <x>0</x> <y>0</y> - <width>180</width> + <width>184</width> <height>276</height> </rect> </property> @@ -17,7 +17,7 @@ <number>6</number> </property> <item> - <widget class="Q3GroupBox" name="colour_correction" > + <widget class="QGroupBox" name="colour_correction" > <property name="title" > <string>colour correction</string> </property> @@ -28,82 +28,24 @@ <item> <layout class="QHBoxLayout" > <item> - <widget class="jahwidgets::qt3::Label" native="1" name="label1" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize" > - <size> - <width>20</width> - <height>20</height> - </size> - </property> - <property name="maximumSize" > - <size> - <width>20</width> - <height>20</height> - </size> - </property> - <property name="pixmap" stdset="0" > - <pixmap>image0</pixmap> - </property> - </widget> + <widget class="QLabel" name="contrast_low" /> </item> <item> - <widget class="jahwidgets::qt3::Slider" native="1" name="contrast" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <widget class="QSlider" name="contrast" > + <property name="orientation" > + <enum>Qt::Horizontal</enum> </property> - <property name="minimumSize" > - <size> - <width>96</width> - <height>17</height> - </size> - </property> - <property name="maximumSize" > - <size> - <width>96</width> - <height>17</height> - </size> - </property> - <property name="maxValue" stdset="0" > - <number>100</number> - </property> - <property name="thumb" stdset="0" > - <pixmap>image1</pixmap> - </property> - <property name="tray" stdset="0" > - <pixmap>image2</pixmap> - </property> </widget> </item> <item> - <widget class="jahwidgets::qt3::Label" native="1" name="label1_2" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize" > - <size> - <width>20</width> - <height>20</height> - </size> - </property> + <widget class="QLabel" name="contrast_high" > <property name="maximumSize" > <size> <width>20</width> <height>20</height> </size> </property> - <property name="pixmap" stdset="0" > + <property name="pixmap" > <pixmap>image3</pixmap> </property> </widget> @@ -113,261 +55,51 @@ <item> <layout class="QHBoxLayout" > <item> - <widget class="jahwidgets::qt3::Label" native="1" name="label1_3" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize" > - <size> - <width>20</width> - <height>20</height> - </size> - </property> - <property name="maximumSize" > - <size> - <width>20</width> - <height>20</height> - </size> - </property> - <property name="pixmap" stdset="0" > - <pixmap>image4</pixmap> - </property> - </widget> + <widget class="QLabel" name="brightness_low" /> </item> <item> - <widget class="jahwidgets::qt3::Slider" native="1" name="brightness" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <widget class="QSlider" name="brightness" > + <property name="orientation" > + <enum>Qt::Horizontal</enum> </property> - <property name="minimumSize" > - <size> - <width>96</width> - <height>17</height> - </size> - </property> - <property name="maximumSize" > - <size> - <width>96</width> - <height>17</height> - </size> - </property> - <property name="minValue" stdset="0" > - <number>0</number> - </property> - <property name="maxValue" stdset="0" > - <number>100</number> - </property> - <property name="thumb" stdset="0" > - <pixmap>image1</pixmap> - </property> - <property name="tray" stdset="0" > - <pixmap>image2</pixmap> - </property> </widget> </item> <item> - <widget class="jahwidgets::qt3::Label" native="1" name="label1_2_2" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize" > - <size> - <width>20</width> - <height>20</height> - </size> - </property> - <property name="maximumSize" > - <size> - <width>20</width> - <height>20</height> - </size> - </property> - <property name="pixmap" stdset="0" > - <pixmap>image5</pixmap> - </property> - </widget> + <widget class="QLabel" name="brightness_high" /> </item> </layout> </item> <item> <layout class="QHBoxLayout" > <item> - <widget class="jahwidgets::qt3::Label" native="1" name="label1_4" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize" > - <size> - <width>20</width> - <height>20</height> - </size> - </property> - <property name="maximumSize" > - <size> - <width>20</width> - <height>20</height> - </size> - </property> - <property name="pixmap" stdset="0" > - <pixmap>image6</pixmap> - </property> - </widget> + <widget class="QLabel" name="saturation_low" /> </item> <item> - <widget class="jahwidgets::qt3::Slider" native="1" name="saturation" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <widget class="QSlider" name="saturation" > + <property name="orientation" > + <enum>Qt::Horizontal</enum> </property> - <property name="minimumSize" > - <size> - <width>96</width> - <height>17</height> - </size> - </property> - <property name="maximumSize" > - <size> - <width>96</width> - <height>17</height> - </size> - </property> - <property name="maxValue" stdset="0" > - <number>100</number> - </property> - <property name="thumb" stdset="0" > - <pixmap>image1</pixmap> - </property> - <property name="tray" stdset="0" > - <pixmap>image2</pixmap> - </property> </widget> </item> <item> - <widget class="jahwidgets::qt3::Label" native="1" name="label1_2_3" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize" > - <size> - <width>20</width> - <height>20</height> - </size> - </property> - <property name="maximumSize" > - <size> - <width>20</width> - <height>20</height> - </size> - </property> - <property name="pixmap" stdset="0" > - <pixmap>image7</pixmap> - </property> - </widget> + <widget class="QLabel" name="saturation_high" /> </item> </layout> </item> <item> <layout class="QHBoxLayout" > <item> - <widget class="jahwidgets::qt3::Label" native="1" name="label1_5" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize" > - <size> - <width>20</width> - <height>20</height> - </size> - </property> - <property name="maximumSize" > - <size> - <width>20</width> - <height>20</height> - </size> - </property> - <property name="pixmap" stdset="0" > - <pixmap/> - </property> - </widget> + <widget class="QLabel" name="hue_low" /> </item> <item> - <widget class="jahwidgets::qt3::Slider" native="1" name="hue" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <widget class="QSlider" name="hue" > + <property name="orientation" > + <enum>Qt::Horizontal</enum> </property> - <property name="minimumSize" > - <size> - <width>96</width> - <height>17</height> - </size> - </property> - <property name="maximumSize" > - <size> - <width>96</width> - <height>17</height> - </size> - </property> - <property name="minValue" stdset="0" > - <number>0</number> - </property> - <property name="maxValue" stdset="0" > - <number>100</number> - </property> - <property name="thumb" stdset="0" > - <pixmap>image1</pixmap> - </property> - <property name="tray" stdset="0" > - <pixmap>image2</pixmap> - </property> </widget> </item> <item> - <widget class="jahwidgets::qt3::Label" native="1" name="label1_2_4" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize" > - <size> - <width>20</width> - <height>20</height> - </size> - </property> - <property name="maximumSize" > - <size> - <width>20</width> - <height>20</height> - </size> - </property> - <property name="pixmap" stdset="0" > - <pixmap>image9</pixmap> - </property> - </widget> + <widget class="QLabel" name="hue_high" /> </item> </layout> </item> @@ -393,24 +125,6 @@ </layout> </widget> <layoutdefault spacing="6" margin="11" /> - <customwidgets> - <customwidget> - <class>Q3GroupBox</class> - <extends>QGroupBox</extends> - <header>Qt3Support/Q3GroupBox</header> - <container>1</container> - </customwidget> - <customwidget> - <class>jahwidgets::qt3::Label</class> - <extends>QWidget</extends> - <header>label.h</header> - </customwidget> - <customwidget> - <class>jahwidgets::qt3::Slider</class> - <extends>QWidget</extends> - <header>slider.h</header> - </customwidget> - </customwidgets> <resources/> <connections/> </ui> Modified: cinesuite/cineplay-cinecode/trunk/src/windows/main_cinecode.ui =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/windows/main_cinecode.ui 2008-09-18 09:11:06 UTC (rev 198) +++ cinesuite/cineplay-cinecode/trunk/src/windows/main_cinecode.ui 2008-09-18 10:11:54 UTC (rev 199) @@ -231,11 +231,14 @@ </property> <item> <widget class="QPushButton" name="toggle_left_tray" > + <property name="checkable" > + <bool>true</bool> + </property> <property name="flat" > <bool>true</bool> </property> <property name="toggleButton" stdset="0" > - <bool>true</bool> + <bool>false</bool> </property> </widget> </item> @@ -247,11 +250,14 @@ <property name="focusPolicy" > <enum>Qt::NoFocus</enum> </property> + <property name="checkable" > + <bool>true</bool> + </property> <property name="flat" > <bool>true</bool> </property> <property name="toggleButton" stdset="0" > - <bool>true</bool> + <bool>false</bool> </property> </widget> </item> Modified: cinesuite/cineplay-cinecode/trunk/src/windows/tray.ui =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/windows/tray.ui 2008-09-18 09:11:06 UTC (rev 198) +++ cinesuite/cineplay-cinecode/trunk/src/windows/tray.ui 2008-09-18 10:11:54 UTC (rev 199) @@ -26,7 +26,7 @@ <number>0</number> </property> <item> - <widget class="Q3Frame" name="top" > + <widget class="QFrame" name="top" > <property name="sizePolicy" > <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > <horstretch>0</horstretch> @@ -173,78 +173,25 @@ <property name="spacing" > <number>0</number> </property> - <property name="margin" > + <property name="leftMargin" > + <number>6</number> + </property> + <property name="topMargin" > <number>0</number> </property> + <property name="rightMargin" > + <number>6</number> + </property> + <property name="bottomMargin" > + <number>0</number> + </property> <item> - <widget class="Q3Frame" name="left_vertical" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize" > - <size> - <width>7</width> - <height>0</height> - </size> - </property> - <property name="maximumSize" > - <size> - <width>7</width> - <height>32767</height> - </size> - </property> - <property name="frameShape" > - <enum>QFrame::StyledPanel</enum> - </property> - <property name="frameShadow" > - <enum>QFrame::Plain</enum> - </property> - <property name="lineWidth" > - <number>0</number> - </property> - </widget> - </item> - <item> <widget class="QWidget" native="1" name="placeholder" /> </item> - <item> - <widget class="Q3Frame" name="right_vertical" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize" > - <size> - <width>7</width> - <height>0</height> - </size> - </property> - <property name="maximumSize" > - <size> - <width>7</width> - <height>32767</height> - </size> - </property> - <property name="frameShape" > - <enum>QFrame::StyledPanel</enum> - </property> - <property name="frameShadow" > - <enum>QFrame::Plain</enum> - </property> - <property name="lineWidth" > - <number>0</number> - </property> - </widget> - </item> </layout> </item> <item> - <widget class="Q3Frame" name="bottom" > + <widget class="QFrame" name="bottom" > <property name="sizePolicy" > <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > <horstretch>0</horstretch> @@ -381,14 +328,6 @@ </layout> </widget> <layoutdefault spacing="6" margin="11" /> - <customwidgets> - <customwidget> - <class>Q3Frame</class> - <extends>QFrame</extends> - <header>Qt3Support/Q3Frame</header> - <container>1</container> - </customwidget> - </customwidgets> <resources/> <connections/> </ui> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-09-18 04:50:02
|
Revision: 200 http://editopia.svn.sourceforge.net/editopia/?rev=200&view=rev Author: timdewhirst Date: 2008-09-18 11:49:58 +0000 (Thu, 18 Sep 2008) Log Message: ----------- cinesuite - more css work Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp cinesuite/cineplay-cinecode/trunk/src/Common.cpp cinesuite/cineplay-cinecode/trunk/src/Utils.cpp cinesuite/cineplay-cinecode/trunk/src/resources/default.css cinesuite/cineplay-cinecode/trunk/src/resources/timeline_thumb_active.png cinesuite/cineplay-cinecode/trunk/src/resources/timeline_thumb_normal.png cinesuite/cineplay-cinecode/trunk/src/resources/timeline_tray_elapsed.png cinesuite/cineplay-cinecode/trunk/src/resources/timeline_tray_empty.png cinesuite/cineplay-cinecode/trunk/src/resources/volume_thumb.png cinesuite/cineplay-cinecode/trunk/src/resources/volume_tray.png cinesuite/cineplay-cinecode/trunk/src/widgets/timelineSlider.cpp cinesuite/cineplay-cinecode/trunk/src/windows/filters.ui cinesuite/cineplay-cinecode/trunk/src/windows/toolbar.ui Modified: cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp 2008-09-18 10:11:54 UTC (rev 199) +++ cinesuite/cineplay-cinecode/trunk/src/CineCode.cpp 2008-09-18 11:49:58 UTC (rev 200) @@ -87,7 +87,6 @@ // encode QMenu* encode = new QMenu( m_impl->m_menubar ); - encode->setPalette( m_impl->m_menubar->palette() ); encode->insertItem( tr( "&encode..." ), this, SLOT( onEncode() ) ); encode->insertItem( tr( "&cancel all" ), this, SLOT( onCancelAll() ) ); encode->insertItem( tr( "set &in point" ), this, SLOT( onSetInPoint() ) ); Modified: cinesuite/cineplay-cinecode/trunk/src/Common.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-09-18 10:11:54 UTC (rev 199) +++ cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-09-18 11:49:58 UTC (rev 200) @@ -191,9 +191,7 @@ // mru menu m_mruMenu = new QMenu( m_menubar ); m_mruList.BuildMenu( m_mruMenu, this, SLOT( onMruSelected(int) ) ); - m_mruMenu->setPalette( menubarPlaceholder->palette() ); - m_fileMenu->setPalette( menubarPlaceholder->palette() ); m_fileMenu->insertItem( tr( "&open file..." ), this, SLOT( onLoad() ) ); m_fileMenu->insertItem( tr( "open &url..." ), this, SLOT( onLoadUrl() ) ); m_fileMenu->insertItem( tr( "open &sequence..." ), this, SLOT( onLoadSequence() ) ); @@ -209,7 +207,6 @@ // view m_menuView = new QMenu( m_menubar ); - m_menuView->setPalette( menubarPlaceholder->palette() ); m_menuViewHalfIndex = m_menuView->insertItem( tr( "&half size" ), this, SLOT( onViewHalfSize() ) ); m_menuViewNormalIndex = m_menuView->insertItem( tr( "&normal size" ), this, SLOT( onViewNormalSize() ) ); m_menuViewDoubleIndex = m_menuView->insertItem( tr( "&double size" ), this, SLOT( onViewDoubleSize() ) ); @@ -223,12 +220,10 @@ // window m_windowMenu = new QMenu( m_menubar ); - m_windowMenu->setPalette( menubarPlaceholder->palette() ); m_windowMenu->insertItem( tr( "&movie info" ), this, SLOT( onShowMovieInfo() ) ); m_favMenu = new QMenu( m_menubar ); m_favList->BuildMenu(m_favMenu, this, SLOT( onFavSelected(int) ) ); - m_favMenu->setPalette( menubarPlaceholder->palette() ); m_windowMenu->insertItem( tr( "&add favorite" ), this, SLOT( onFavAdd() ) ); m_windowMenu->insertItem( tr( "&remove favorite" ), this, SLOT( onFavRemove() ) ); @@ -240,7 +235,6 @@ // help QMenu* help = new QMenu( m_menubar ); - help->setPalette( menubarPlaceholder->palette() ); help->insertItem( tr( "&help" ), this, SLOT( onHelp() ) ); help->insertItem( tr( "&check for updates" ), this, SLOT( onCheckVersion() ) ); help->insertItem( tr( "&website" ), this, SLOT( onGotoWebsite() ) ); Modified: cinesuite/cineplay-cinecode/trunk/src/Utils.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Utils.cpp 2008-09-18 10:11:54 UTC (rev 199) +++ cinesuite/cineplay-cinecode/trunk/src/Utils.cpp 2008-09-18 11:49:58 UTC (rev 200) @@ -196,7 +196,8 @@ { if ( !parent->layout() ) { - (void*)new QVBoxLayout( parent ); + QLayout* l = new QVBoxLayout( parent ); + l->setMargin( 0 ); } parent->layout()->add( w ); w->updateGeometry(); Modified: cinesuite/cineplay-cinecode/trunk/src/resources/default.css =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/resources/default.css 2008-09-18 10:11:54 UTC (rev 199) +++ cinesuite/cineplay-cinecode/trunk/src/resources/default.css 2008-09-18 11:49:58 UTC (rev 200) @@ -1,30 +1,65 @@ QWidget { color: white; + background-color: rgb( 0, 0, 0, 0% ); } -#Main, #tray { - /*background: #363636;*/ +#tray { + background: qlineargradient(x1:0, y1:0, x2:0, y2:1, + stop: 0 #424242, stop: 1 #181818); +} + +QFrame#titlebar { background: qlineargradient( x1:0, y1:0, x2:0, y2:1, - stop: 0 #424242, stop: 1 #181818); + stop: 0 #424242, stop: 1 #363636); } -QFrame { - border-style: none; +#toolbar { + background: qlineargradient( x1:0, y1:0, x2:0, y2:0.6, + stop: 0 #363636, stop: 1 #181818); } -QPushButton { +#Main { border: none; + background: #363636; + min-width: 410px; + min-height: 350px; } -QFrame#titlebar { - background: qlineargradient( x1:0, y1:0, x2:0, y2:1, - stop: 0 #424242, stop: 1 #363636); +#tray QWidget#placeholder { + background-color: #f8f8f8; } -#filters { - background: #f8f8f8; +#filters QWidget { + color: black; } +#filters QSlider { + min-height: 17px; + max-height: 17px; + min-width: 97px; + max-width: 97px; +} + +#filters QSlider::groove:horizontal { + background-image: url(":/images/small_slider_tray"); + min-height: 17px; + max-height: 17px; + min-width: 97px; + max-width: 97px; +} + +#filters QSlider::handle:horizontal { + image: url(":/images/small_slider_thumb"); +} + +QFrame { + border-style: none; +} + +QPushButton { + border: none; +} + #brightness_low, #brightness_high, #contrast_low, #contrast_high, #hue_low, #hue_high, @@ -68,48 +103,46 @@ background-image: url(":/images/saturation_high"); } -#toggle_left_tray, #toggle_right_tray:checked { - background-image: url(":/images/arrows_left_normal"); +#toggle_left_tray, #toggle_right_tray { min-width: 26px; max-width: 26px; min-height: 26px; max-height: 26px; } +#toggle_left_tray, #toggle_right_tray:checked { + background-image: url(":/images/arrows_left_normal"); +} + #toggle_left_tray:hover, #toggle_right_tray:hover:checked { background-image: url(":/images/arrows_left_active"); } #toggle_right_tray, #toggle_left_tray:checked { background-image: url(":/images/arrows_right_normal"); - min-width: 26px; - max-width: 26px; - min-height: 26px; - max-height: 26px; } #toggle_right_tray:hover, #toggle_left_tray:hover:checked { background-image: url(":/images/arrows_right_active"); } -#minimize { - background-image: url(":/images/minimize_normal"); +#minimize, #maximize, #close { min-width: 26px; max-width: 26px; min-height: 32px; max-height: 32px; } +#minimize { + background-image: url(":/images/minimize_normal"); +} + #minimize:hover { background-image: url(":/images/minimize_active"); } #maximize { background-image: url(":/images/maximize_normal"); - min-width: 26px; - max-width: 26px; - min-height: 32px; - max-height: 32px; } #maximize:hover { @@ -118,10 +151,6 @@ #close { background-image: url(":/images/close_normal"); - min-width: 26px; - max-width: 26px; - min-height: 32px; - max-height: 32px; } #close:hover { @@ -147,3 +176,30 @@ { background-image: url(":/images/button_active"); } + +QSlider#volume { + min-height: 20px; + max-height: 20px; + min-width: 40px; + max-width: 40px; +} + +QSlider#volume::groove:horizontal { + background-image: url(":/images/volume_tray"); +} + +QSlider#volume::handle:horizontal { + image: url(":/images/volume_thumb"); +} + +#mute { + background-image: url(":/images/audio_on"); + min-width: 20px; + max-width: 20px; + min-height: 15px; + max-height: 15px; +} + +#mute:on { + background-image: url(":/images/audio_mute"); +} Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/timelineSlider.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/widgets/timelineSlider.cpp 2008-09-18 10:11:54 UTC (rev 199) +++ cinesuite/cineplay-cinecode/trunk/src/widgets/timelineSlider.cpp 2008-09-18 11:49:58 UTC (rev 200) @@ -467,7 +467,6 @@ : QWidget( parent, name ), m_impl( new PrivateTimeline( this ) ) { - setBackgroundMode( Qt::NoBackground ); setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); connect( this, SIGNAL( sliderPressed() ), this, SLOT( onSliderPressed() ) ); connect( this, SIGNAL( sliderReleased() ), this, SLOT( onSliderReleased() ) ); @@ -1228,12 +1227,8 @@ m_impl->buffer.resize( size() ); QPainter p( &m_impl->buffer ); - - // fill the background - p.setBrush( colorGroup().button().light() ); - p.setPen( colorGroup().shadow() ); - p.drawRect( 0, 0, width(), height() ); - + p.initFrom( this ); + const int PADDING = height() / 20; const int HALF_HEIGHT = height() / 2; Modified: cinesuite/cineplay-cinecode/trunk/src/windows/filters.ui =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/windows/filters.ui 2008-09-18 10:11:54 UTC (rev 199) +++ cinesuite/cineplay-cinecode/trunk/src/windows/filters.ui 2008-09-18 11:49:58 UTC (rev 200) @@ -1,14 +1,6 @@ <ui version="4.0" > <class>filters</class> <widget class="QWidget" name="filters" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>184</width> - <height>276</height> - </rect> - </property> <property name="windowTitle" > <string>Form1</string> </property> Modified: cinesuite/cineplay-cinecode/trunk/src/windows/toolbar.ui =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/windows/toolbar.ui 2008-09-18 10:11:54 UTC (rev 199) +++ cinesuite/cineplay-cinecode/trunk/src/windows/toolbar.ui 2008-09-18 11:49:58 UTC (rev 200) @@ -43,9 +43,18 @@ <property name="spacing" > <number>0</number> </property> - <property name="margin" > + <property name="leftMargin" > + <number>6</number> + </property> + <property name="topMargin" > <number>0</number> </property> + <property name="rightMargin" > + <number>6</number> + </property> + <property name="bottomMargin" > + <number>0</number> + </property> <item> <widget class="QFrame" name="frame27" > <property name="sizePolicy" > @@ -111,7 +120,7 @@ </size> </property> <property name="enableInOutControls" stdset="0" > - <bool>false</bool> + <bool>true</bool> </property> <property name="thumb" stdset="0" > <pixmap resource="../resources/resources.qrc" >:/images/timeline_thumb_normal</pixmap> @@ -126,16 +135,16 @@ <pixmap resource="../resources/resources.qrc" >:/images/timeline_tray_elapsed</pixmap> </property> <property name="inThumb" stdset="0" > - <pixmap>image5</pixmap> + <pixmap/> </property> <property name="inThumbActive" stdset="0" > - <pixmap>image5</pixmap> + <pixmap/> </property> <property name="outThumb" stdset="0" > - <pixmap>image6</pixmap> + <pixmap/> </property> <property name="outThumbActive" stdset="0" > - <pixmap>image6</pixmap> + <pixmap/> </property> </widget> </item> @@ -149,9 +158,12 @@ <property name="spacing" > <number>0</number> </property> - <property name="margin" > + <property name="topMargin" > <number>0</number> </property> + <property name="bottomMargin" > + <number>0</number> + </property> <item> <widget class="QFrame" name="frame19_3" > <property name="sizePolicy" > @@ -200,24 +212,15 @@ </item> <item> <widget class="QPushButton" name="mute" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize" > - <size> - <width>20</width> - <height>15</height> - </size> - </property> <property name="focusPolicy" > <enum>Qt::NoFocus</enum> </property> <property name="text" > <string/> </property> + <property name="checkable" > + <bool>true</bool> + </property> <property name="flat" > <bool>true</bool> </property> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-09-18 05:58:34
|
Revision: 201 http://editopia.svn.sourceforge.net/editopia/?rev=201&view=rev Author: timdewhirst Date: 2008-09-18 12:58:32 +0000 (Thu, 18 Sep 2008) Log Message: ----------- cinesuite - change transport buttons to be in css not .ui Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/resources/default.css cinesuite/cineplay-cinecode/trunk/src/windows/toolbar.ui Modified: cinesuite/cineplay-cinecode/trunk/src/resources/default.css =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/resources/default.css 2008-09-18 11:49:58 UTC (rev 200) +++ cinesuite/cineplay-cinecode/trunk/src/resources/default.css 2008-09-18 12:58:32 UTC (rev 201) @@ -203,3 +203,65 @@ #mute:on { background-image: url(":/images/audio_mute"); } + +#goto_start, #goto_end, #step_back, #step_fwd { + min-width: 39px; + max-width: 39px; + min-height: 48px; + max-height: 48px; +} + +#play { + min-width: 46px; + max-width: 46px; + min-height: 48px; + max-height: 48px; +} + +#goto_start { + background-image: url(":/images/start_normal"); +} + +#goto_start:hover { + background-image: url(":/images/start_active"); +} + +#goto_end { + background-image: url(":/images/end_normal"); +} + +#end_start:hover { + background-image: url(":/images/end_active"); +} + +#step_back { + background-image: url(":/images/back_normal"); +} + +#step_back:hover { + background-image: url(":/images/back_active"); +} + +#step_fwd { + background-image: url(":/images/forward_normal"); +} + +#step_fwd:hover { + background-image: url(":/images/forward_active"); +} + +#play { + background-image: url(":/images/play_normal"); +} + +#play:hover { + background-image: url(":/images/play_active"); +} + +#play:on { + background-image: url(":/images/pause_normal"); +} + +#play:on:hover { + background-image: url(":/images/pause_active"); +} Modified: cinesuite/cineplay-cinecode/trunk/src/windows/toolbar.ui =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/windows/toolbar.ui 2008-09-18 11:49:58 UTC (rev 200) +++ cinesuite/cineplay-cinecode/trunk/src/windows/toolbar.ui 2008-09-18 12:58:32 UTC (rev 201) @@ -318,23 +318,11 @@ <item> <widget class="QFrame" name="frame19_3_3" > <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > + <sizepolicy vsizetype="Preferred" hsizetype="Minimum" > <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize" > - <size> - <width>193</width> - <height>48</height> - </size> - </property> - <property name="maximumSize" > - <size> - <width>193</width> - <height>48</height> - </size> - </property> <property name="frameShape" > <enum>QFrame::NoFrame</enum> </property> @@ -344,275 +332,79 @@ <property name="lineWidth" > <number>0</number> </property> - <widget class="QPushButton" name="step_back" > - <property name="geometry" > - <rect> - <x>37</x> - <y>1</y> - <width>39</width> - <height>48</height> - </rect> + <layout class="QHBoxLayout" name="horizontalLayout" > + <property name="spacing" > + <number>0</number> </property> - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <property name="margin" > + <number>0</number> </property> - <property name="minimumSize" > - <size> - <width>39</width> - <height>48</height> - </size> - </property> - <property name="maximumSize" > - <size> - <width>39</width> - <height>48</height> - </size> - </property> - <property name="focusPolicy" > - <enum>Qt::NoFocus</enum> - </property> - <property name="text" > - <string/> - </property> - <property name="icon" > - <iconset resource="../resources/resources.qrc" > - <normaloff>:/images/back_normal</normaloff> - <activeoff>:/images/back_active</activeoff>:/images/back_normal</iconset> - </property> - <property name="iconSize" > - <size> - <width>39</width> - <height>48</height> - </size> - </property> - <property name="autoRepeat" > - <bool>true</bool> - </property> - <property name="flat" > - <bool>true</bool> - </property> - <property name="pixmap" stdset="0" > - <pixmap>image12</pixmap> - </property> - </widget> - <widget class="QPushButton" name="play" > - <property name="geometry" > - <rect> - <x>75</x> - <y>1</y> - <width>46</width> - <height>48</height> - </rect> - </property> - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize" > - <size> - <width>46</width> - <height>48</height> - </size> - </property> - <property name="maximumSize" > - <size> - <width>46</width> - <height>48</height> - </size> - </property> - <property name="focusPolicy" > - <enum>Qt::NoFocus</enum> - </property> - <property name="text" > - <string/> - </property> - <property name="icon" > - <iconset resource="../resources/resources.qrc" > - <normaloff>:/images/play_normal</normaloff> - <normalon>:/images/pause_normal</normalon> - <activeoff>:/images/play_active</activeoff> - <activeon>:/images/pause_active</activeon>:/images/play_normal</iconset> - </property> - <property name="iconSize" > - <size> - <width>46</width> - <height>48</height> - </size> - </property> - <property name="checkable" > - <bool>true</bool> - </property> - <property name="flat" > - <bool>true</bool> - </property> - <property name="pixmap" stdset="0" > - <pixmap>image14</pixmap> - </property> - <property name="toggleButton" stdset="0" > - <bool>true</bool> - </property> - </widget> - <widget class="QPushButton" name="step_fwd" > - <property name="geometry" > - <rect> - <x>118</x> - <y>1</y> - <width>39</width> - <height>48</height> - </rect> - </property> - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize" > - <size> - <width>39</width> - <height>48</height> - </size> - </property> - <property name="maximumSize" > - <size> - <width>39</width> - <height>48</height> - </size> - </property> - <property name="focusPolicy" > - <enum>Qt::NoFocus</enum> - </property> - <property name="text" > - <string/> - </property> - <property name="icon" > - <iconset resource="../resources/resources.qrc" > - <normaloff>:/images/forward_normal</normaloff> - <activeoff>:/images/forward_active</activeoff>:/images/forward_normal</iconset> - </property> - <property name="iconSize" > - <size> - <width>39</width> - <height>48</height> - </size> - </property> - <property name="checkable" > - <bool>false</bool> - </property> - <property name="autoRepeat" > - <bool>true</bool> - </property> - <property name="flat" > - <bool>true</bool> - </property> - <property name="pixmap" stdset="0" > - <pixmap>image18</pixmap> - </property> - </widget> - <widget class="QPushButton" name="goto_start" > - <property name="geometry" > - <rect> - <x>0</x> - <y>1</y> - <width>39</width> - <height>48</height> - </rect> - </property> - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize" > - <size> - <width>39</width> - <height>48</height> - </size> - </property> - <property name="maximumSize" > - <size> - <width>39</width> - <height>48</height> - </size> - </property> - <property name="focusPolicy" > - <enum>Qt::NoFocus</enum> - </property> - <property name="text" > - <string/> - </property> - <property name="icon" > - <iconset resource="../resources/resources.qrc" > - <normaloff>:/images/start_normal</normaloff> - <activeoff>:/images/start_active</activeoff>:/images/start_normal</iconset> - </property> - <property name="iconSize" > - <size> - <width>39</width> - <height>48</height> - </size> - </property> - <property name="flat" > - <bool>true</bool> - </property> - </widget> - <widget class="QPushButton" name="goto_end" > - <property name="geometry" > - <rect> - <x>154</x> - <y>1</y> - <width>39</width> - <height>48</height> - </rect> - </property> - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize" > - <size> - <width>39</width> - <height>48</height> - </size> - </property> - <property name="maximumSize" > - <size> - <width>39</width> - <height>48</height> - </size> - </property> - <property name="focusPolicy" > - <enum>Qt::NoFocus</enum> - </property> - <property name="text" > - <string/> - </property> - <property name="icon" > - <iconset resource="../resources/resources.qrc" > - <normaloff>:/images/end_normal</normaloff> - <activeoff>:/images/end_active</activeoff>:/images/end_normal</iconset> - </property> - <property name="iconSize" > - <size> - <width>39</width> - <height>48</height> - </size> - </property> - <property name="autoRepeat" > - <bool>false</bool> - </property> - <property name="flat" > - <bool>true</bool> - </property> - </widget> + <item> + <widget class="QPushButton" name="goto_start" > + <property name="flat" > + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="step_back" > + <property name="autoRepeat" > + <bool>true</bool> + </property> + <property name="flat" > + <bool>true</bool> + </property> + <property name="pixmap" stdset="0" > + <pixmap/> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="play" > + <property name="checkable" > + <bool>true</bool> + </property> + <property name="flat" > + <bool>true</bool> + </property> + <property name="pixmap" stdset="0" > + <pixmap/> + </property> + <property name="toggleButton" stdset="0" > + <bool>false</bool> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="step_fwd" > + <property name="checkable" > + <bool>false</bool> + </property> + <property name="autoRepeat" > + <bool>true</bool> + </property> + <property name="flat" > + <bool>true</bool> + </property> + <property name="pixmap" stdset="0" > + <pixmap/> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="goto_end" > + <property name="focusPolicy" > + <enum>Qt::NoFocus</enum> + </property> + <property name="autoRepeat" > + <bool>false</bool> + </property> + <property name="flat" > + <bool>true</bool> + </property> + </widget> + </item> + </layout> </widget> </item> <item> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-09-18 07:17:59
|
Revision: 202 http://editopia.svn.sourceforge.net/editopia/?rev=202&view=rev Author: timdewhirst Date: 2008-09-18 14:17:57 +0000 (Thu, 18 Sep 2008) Log Message: ----------- cinesuite - make menubar appear Modified Paths: -------------- cinesuite/cineplay-cinecode/trunk/src/Common.cpp cinesuite/cineplay-cinecode/trunk/src/Utils.cpp cinesuite/cineplay-cinecode/trunk/src/resources/default.css Modified: cinesuite/cineplay-cinecode/trunk/src/Common.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-09-18 12:58:32 UTC (rev 201) +++ cinesuite/cineplay-cinecode/trunk/src/Common.cpp 2008-09-18 14:17:57 UTC (rev 202) @@ -183,8 +183,10 @@ menubarPlaceholder->hide(); #endif - m_menubar = new QMenuBar( menubarPlaceholder ); - + m_menubar = new QMenuBar; + m_menubar->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ); + CineUtils::AddWidgetToParentLayout( menubarPlaceholder, m_menubar ); + // file m_fileMenu = new QMenu( m_menubar ); Modified: cinesuite/cineplay-cinecode/trunk/src/Utils.cpp =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/Utils.cpp 2008-09-18 12:58:32 UTC (rev 201) +++ cinesuite/cineplay-cinecode/trunk/src/Utils.cpp 2008-09-18 14:17:57 UTC (rev 202) @@ -207,8 +207,6 @@ QWidget* FindWidget( const char* name, QWidget* parent ) { - DEBUG_LOG << "name: " << name << " parent: " << parent; - if( !parent ) return NULL; @@ -217,9 +215,7 @@ if ( !objList.isEmpty() ) result = objList.first(); - { - DEBUG_LOG << "result: " << result; - } + DEBUG_LOG << "name: " << name << " parent: " << parent << " result: " << result; return result; } Modified: cinesuite/cineplay-cinecode/trunk/src/resources/default.css =================================================================== --- cinesuite/cineplay-cinecode/trunk/src/resources/default.css 2008-09-18 12:58:32 UTC (rev 201) +++ cinesuite/cineplay-cinecode/trunk/src/resources/default.css 2008-09-18 14:17:57 UTC (rev 202) @@ -3,6 +3,11 @@ background-color: rgb( 0, 0, 0, 0% ); } +QMenu { + color: white; + background: #363636; +} + #tray { background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop: 0 #424242, stop: 1 #181818); @@ -230,7 +235,7 @@ background-image: url(":/images/end_normal"); } -#end_start:hover { +#goto_end:hover { background-image: url(":/images/end_active"); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |