kamoso:kamoso-rshah.git
8 years agomerge from kamoso master master
reza shah [Mon, 19 Oct 2009 07:30:34 +0000 (16:30 +0900)]
merge from kamoso master

8 years agoModified default value, from 20 to 2.
Alex Fiestas [Thu, 15 Oct 2009 23:00:49 +0000 (23:00 +0000)]
Modified default value, from 20 to 2.
(cherry picked from commit 4c2b4d5e653cd9f9b5e0efe5001928073232bf10)

8 years agoMerge branch 'master' of gitorious.org:kamoso/mainline
Alex Fiestas [Tue, 13 Oct 2009 13:26:23 +0000 (13:26 +0000)]
Merge branch 'master' of gitorious.org:kamoso/mainline

8 years agoImportant fix on video-recording
Alex Fiestas [Tue, 13 Oct 2009 11:51:18 +0000 (11:51 +0000)]
Important fix on video-recording

8 years agoMerge commit 'c7f75ae'
Aleix Pol [Fri, 9 Oct 2009 21:14:08 +0000 (23:14 +0200)]
Merge commit 'c7f75ae'

8 years agoAdded translations for czech and greek.
Aleix Pol [Fri, 9 Oct 2009 21:10:42 +0000 (23:10 +0200)]
Added translations for czech and greek.

8 years agoMerge commit 'refs/merge-requests/1665' of git://gitorious.org/kamoso/mainline
Alex Fiestas [Thu, 1 Oct 2009 08:57:22 +0000 (08:57 +0000)]
Merge commit 'refs/merge-requests/1665' of git://gitorious.org/kamoso/mainline

Conflicts:
TODO

8 years agoTODO updated
akademy [Thu, 1 Oct 2009 08:50:29 +0000 (08:50 +0000)]
TODO updated

8 years agoReplace spaces by tabs in rshah merge request
Alex Fiestas [Tue, 29 Sep 2009 00:08:24 +0000 (00:08 +0000)]
Replace spaces by tabs in rshah merge request

8 years agoMerge branches 'master' and 'rsah'
Alex Fiestas [Tue, 29 Sep 2009 00:06:43 +0000 (00:06 +0000)]
Merge branches 'master' and 'rsah'

9 years agoadd i18nc to device combobox text
reza shah [Sun, 27 Sep 2009 01:07:56 +0000 (10:07 +0900)]
add i18nc to device combobox text

9 years agoAdd vendor name and display it at combo box
reza shah [Thu, 24 Sep 2009 23:28:09 +0000 (08:28 +0900)]
Add vendor name and display it at combo box
Set size policy to fixed for groupbox at main window.

9 years agoMerge branch 'master' of gitorious.org:kamoso/mainline
Alex Fiestas [Thu, 17 Sep 2009 08:23:55 +0000 (08:23 +0000)]
Merge branch 'master' of gitorious.org:kamoso/mainline

9 years agoReplaced set_drawable by xwindow because drawable has been deprecated and at the...
Alex Fiestas [Thu, 17 Sep 2009 08:22:16 +0000 (08:22 +0000)]
Replaced set_drawable by xwindow because drawable has been deprecated and at the moment we don't support
anything more than linux (yes, the kernel :p)

9 years agoconfig-nepomuk.h.cmake needed to make nepomuk optional :)
Alex Fiestas [Thu, 17 Sep 2009 08:16:36 +0000 (08:16 +0000)]
config-nepomuk.h.cmake needed to make nepomuk optional :)

9 years agoAdded some nepomuk magic in kamoso. kamoso tag is added on all pictures/videos.
Alex Fiestas [Thu, 17 Sep 2009 08:15:48 +0000 (08:15 +0000)]
Added some nepomuk magic in kamoso. kamoso tag is added on all pictures/videos.

9 years agoMerge branch 'master' into stable stable
Aleix Pol [Wed, 16 Sep 2009 01:03:00 +0000 (03:03 +0200)]
Merge branch 'master' into stable

9 years agoMerge commit 'refs/merge-requests/1523' of git://gitorious.org/kamoso/mainline
Aleix Pol [Wed, 16 Sep 2009 00:56:02 +0000 (02:56 +0200)]
Merge commit 'refs/merge-requests/1523' of git://gitorious.org/kamoso/mainline

9 years agoAdded galician translation.
José Manuel Santamaría Lema [Wed, 16 Sep 2009 00:52:11 +0000 (02:52 +0200)]
Added galician translation.

9 years agoUpdated version number for stable.
Aleix Pol [Tue, 15 Sep 2009 23:39:28 +0000 (01:39 +0200)]
Updated version number for stable.

9 years agoMerge commit 'refs/merge-requests/1491' of gitorious.org:kamoso/mainline
Aleix Pol [Tue, 15 Sep 2009 22:57:49 +0000 (00:57 +0200)]
Merge commit 'refs/merge-requests/1491' of gitorious.org:kamoso/mainline

9 years agoMake it possible to install translations.
Aleix Pol [Tue, 15 Sep 2009 22:55:00 +0000 (00:55 +0200)]
Make it possible to install translations.

9 years agoMerge branch 'master' of gitorious.org:kamoso/mainline
Aleix Pol [Tue, 15 Sep 2009 21:52:55 +0000 (23:52 +0200)]
Merge branch 'master' of gitorious.org:kamoso/mainline

9 years agoFix warning
Aleix Pol [Tue, 15 Sep 2009 20:47:09 +0000 (22:47 +0200)]
Fix warning

9 years agoUploaded the first version of spanish translation.
Alex Fiestas [Mon, 14 Sep 2009 10:01:34 +0000 (10:01 +0000)]
Uploaded the first version of spanish translation.

9 years agoMerge commit 'refs/merge-requests/1488' of git://gitorious.org/kamoso/mainline
Aleix Pol [Sun, 13 Sep 2009 23:46:39 +0000 (16:46 -0700)]
Merge commit 'refs/merge-requests/1488' of git://gitorious.org/kamoso/mainline

9 years agoMerge commit 'refs/merge-requests/1478' of git://gitorious.org/kamoso/mainline
Aleix Pol [Sun, 13 Sep 2009 23:46:09 +0000 (16:46 -0700)]
Merge commit 'refs/merge-requests/1478' of git://gitorious.org/kamoso/mainline

9 years agoUse some icons for the preferences dialog.
José Manuel Santamaría Lema [Sun, 13 Sep 2009 19:32:58 +0000 (21:32 +0200)]
Use some icons for the preferences dialog.

9 years agoConnect the countdown's finished signal outside the constructors. We're not
José Manuel Santamaría Lema [Sun, 13 Sep 2009 12:43:12 +0000 (14:43 +0200)]
Connect the countdown's finished signal outside the constructors. We're not
deleting the objects so we will connect twice the same signal if we do the
connects inside the constructors.

9 years agoNow that we've stable version, the git one must conflict with it.
Alex Fiestas [Sun, 13 Sep 2009 01:17:43 +0000 (01:17 +0000)]
Now that we've stable version, the git one must conflict with it.

9 years agoMakes the code a bit more beatiful :p
Alex Fiestas [Sat, 12 Sep 2009 22:46:04 +0000 (22:46 +0000)]
Makes the code a bit more beatiful :p

9 years agoFixed a bug while dealing with mwallet. This should be released ASAP!
Alex Fiestas [Sat, 12 Sep 2009 22:45:05 +0000 (22:45 +0000)]
Fixed a bug while dealing with mwallet. This should be released ASAP!

9 years agoAdded deactivate virtual function in shootmode and his implementations in each mode...
Alex Fiestas [Sat, 12 Sep 2009 22:21:08 +0000 (22:21 +0000)]
Added deactivate virtual function in shootmode and his implementations in each mode. This is particulary
important since we're not deleting the objects so we lack something like a destructor.

9 years agoUpdate the German translation
Panagiotis Papadopoulos [Sat, 12 Sep 2009 22:07:17 +0000 (00:07 +0200)]
Update the German translation

9 years agoRestored the "setBrightness back" function now only if flash is enabled.
Alex Fiestas [Sat, 12 Sep 2009 21:15:49 +0000 (21:15 +0000)]
Restored the "setBrightness back" function now only if flash is enabled.

9 years agoSet currentTime to 0 when the countdown is canceled, If not this produce and odd...
Alex Fiestas [Sat, 12 Sep 2009 21:11:02 +0000 (21:11 +0000)]
Set currentTime to 0 when the countdown is canceled, If not this produce and odd behaviour

9 years agoAdded catalan translation
Aleix Pol [Sat, 12 Sep 2009 16:49:06 +0000 (18:49 +0200)]
Added catalan translation
Updated .pot file and deutsch translation

9 years agoUpdated translation file.
Aleix Pol [Sat, 12 Sep 2009 16:22:13 +0000 (18:22 +0200)]
Updated translation file.

9 years agoLet the user to cancel the photo taking when unchecking the take picture button.
Aleix Pol [Sat, 12 Sep 2009 16:16:32 +0000 (18:16 +0200)]
Let the user to cancel the photo taking when unchecking the take picture button.

9 years agoRemoved unused API.
Aleix Pol [Sat, 12 Sep 2009 16:15:00 +0000 (18:15 +0200)]
Removed unused API.

9 years agoFixed some burst mode semantics.
Aleix Pol [Sat, 12 Sep 2009 15:33:35 +0000 (17:33 +0200)]
Fixed some burst mode semantics.

9 years agoIf we request for a specific plugin before it's been loaded, first load all plugins...
Aleix Pol [Sat, 12 Sep 2009 14:57:15 +0000 (16:57 +0200)]
If we request for a specific plugin before it's been loaded, first load all plugins before crashing.

9 years agoMerge branch 'master' of gitorious.org:kamoso/mainline
Aleix Pol [Sat, 12 Sep 2009 14:33:28 +0000 (16:33 +0200)]
Merge branch 'master' of gitorious.org:kamoso/mainline

9 years agoadded author file
Aleix Pol [Fri, 11 Sep 2009 15:03:53 +0000 (17:03 +0200)]
added author file

9 years agoAdded some needed license files
Aleix Pol [Fri, 11 Sep 2009 15:01:52 +0000 (17:01 +0200)]
Added some needed license files

9 years agoInitial German translation
Panagiotis Papadopoulos [Thu, 10 Sep 2009 00:32:08 +0000 (02:32 +0200)]
Initial German translation

9 years ago[yY]outube -> YouTube
Panagiotis Papadopoulos [Thu, 10 Sep 2009 00:15:27 +0000 (02:15 +0200)]
[yY]outube -> YouTube

9 years ago[yY]outube -> YouTube
Panagiotis Papadopoulos [Thu, 10 Sep 2009 00:14:26 +0000 (02:14 +0200)]
[yY]outube -> YouTube

9 years agoModified 3 strings, make them comply to KDE HIG
Panagiotis Papadopoulos [Wed, 9 Sep 2009 23:13:07 +0000 (01:13 +0200)]
Modified 3 strings, make them comply to KDE HIG

9 years agoFixed compilation on some systems
Aleix Pol [Wed, 9 Sep 2009 22:42:48 +0000 (00:42 +0200)]
Fixed compilation on some systems

9 years agofix typos by albert.
Aleix Pol [Wed, 9 Sep 2009 21:21:44 +0000 (23:21 +0200)]
fix typos by albert.

9 years agoer.. :$
Aleix Pol [Wed, 9 Sep 2009 21:07:28 +0000 (23:07 +0200)]
er.. :$

9 years agoFixed layouts.
Aleix Pol [Wed, 9 Sep 2009 20:55:28 +0000 (22:55 +0200)]
Fixed layouts.

9 years agoPlacing settings menu
Aleix Pol [Wed, 9 Sep 2009 20:53:57 +0000 (22:53 +0200)]
Placing settings menu

9 years agoDo not crash if there is no webcam
Aleix Pol [Wed, 9 Sep 2009 20:45:18 +0000 (22:45 +0200)]
Do not crash if there is no webcam

9 years agoAdded some icon.
Aleix Pol [Wed, 9 Sep 2009 20:38:21 +0000 (22:38 +0200)]
Added some icon.

9 years agoFix typo
Aleix Pol [Wed, 9 Sep 2009 20:29:22 +0000 (22:29 +0200)]
Fix typo

9 years agoFix compilation
Aleix Pol [Wed, 9 Sep 2009 20:26:24 +0000 (22:26 +0200)]
Fix compilation

9 years agoAdded some translation support
Aleix Pol [Wed, 9 Sep 2009 19:59:23 +0000 (21:59 +0200)]
Added some translation support

9 years agotooltip when chosing mode.
Aleix Pol [Wed, 9 Sep 2009 17:46:22 +0000 (19:46 +0200)]
tooltip when chosing mode.

9 years agosmall cleanup
Aleix Pol [Wed, 9 Sep 2009 17:32:12 +0000 (19:32 +0200)]
small cleanup

9 years agoModified copyright
Alex Fiestas [Wed, 9 Sep 2009 19:30:06 +0000 (19:30 +0000)]
Modified copyright

9 years agoMerge branch 'master' of gitorious.org:kamoso/mainline
Alex Fiestas [Wed, 9 Sep 2009 19:20:53 +0000 (19:20 +0000)]
Merge branch 'master' of gitorious.org:kamoso/mainline

9 years agoMerge branch 'master' of gitorious.org:kamoso/mainline
Alex Fiestas [Wed, 9 Sep 2009 19:20:44 +0000 (19:20 +0000)]
Merge branch 'master' of gitorious.org:kamoso/mainline

Conflicts:
src/kamoso.cpp
src/photoshootmode.h
src/plugins/youtube/youtube.cpp
src/videoshootmode.h

9 years agoAdded dynamic mimetype depending of the mode, each mode have a thumbnailsMimeType...
Alex Fiestas [Wed, 9 Sep 2009 17:30:59 +0000 (17:30 +0000)]
Added dynamic mimetype depending of the mode, each mode have a thumbnailsMimeType method which returns a
QStringList.

9 years agoadd missing file
Aleix Pol [Wed, 9 Sep 2009 17:11:01 +0000 (19:11 +0200)]
add missing file

9 years agoAdded youtube icons
Aleix Pol [Wed, 9 Sep 2009 17:00:13 +0000 (19:00 +0200)]
Added youtube icons

9 years agoSome tunning on the semaphore
Aleix Pol [Wed, 9 Sep 2009 16:49:07 +0000 (18:49 +0200)]
Some tunning on the semaphore

9 years agoNew dialog working perfectlu, with or withour KWwallet access.
Alex Fiestas [Wed, 9 Sep 2009 15:20:53 +0000 (15:20 +0000)]
New dialog working perfectlu, with or withour KWwallet access.

9 years agoSome interface makeup.
Aleix Pol [Wed, 9 Sep 2009 15:09:38 +0000 (17:09 +0200)]
Some interface makeup.

9 years agoNew dialog ++, only 1 bug reaming
Alex Fiestas [Wed, 9 Sep 2009 15:02:40 +0000 (15:02 +0000)]
New dialog ++, only 1 bug reaming

9 years agoRemoved unused buttom, it have no sense in this dialog
Alex Fiestas [Wed, 9 Sep 2009 14:37:39 +0000 (14:37 +0000)]
Removed unused buttom, it have no sense in this dialog

9 years agoReplaced the old auth dialog with the standar PasswordDialog
Alex Fiestas [Wed, 9 Sep 2009 14:36:44 +0000 (14:36 +0000)]
Replaced the old auth dialog with the standar PasswordDialog

9 years agoFixed down state for shoot mode switch.
Aleix Pol [Wed, 9 Sep 2009 12:33:01 +0000 (14:33 +0200)]
Fixed down state for shoot mode switch.

9 years agoMake shoot modes configurable.
Aleix Pol [Wed, 9 Sep 2009 12:15:56 +0000 (14:15 +0200)]
Make shoot modes configurable.

9 years agoChanged desciption of Video information dialog
Alex Fiestas [Wed, 9 Sep 2009 11:44:31 +0000 (11:44 +0000)]
Changed desciption of Video information dialog

9 years agoRemoved items from the menu in KDirOperator.
Aleix Pol [Wed, 9 Sep 2009 11:39:34 +0000 (13:39 +0200)]
Removed items from the menu in KDirOperator.
Added trash plugin.

9 years agoNotification stuff done. In the sprint we'll decide how to do it finally.
Alex Fiestas [Sun, 6 Sep 2009 20:09:12 +0000 (20:09 +0000)]
Notification stuff done. In the sprint we'll decide how to do it finally.

9 years agoMerge branch 'youtube'
Alex Fiestas [Sun, 6 Sep 2009 18:07:30 +0000 (18:07 +0000)]
Merge branch 'youtube'

9 years agoYoutube plugin should be almost complete, time to merge!
Alex Fiestas [Sun, 6 Sep 2009 18:07:14 +0000 (18:07 +0000)]
Youtube plugin should be almost complete, time to merge!

9 years agoSome UI tweaks in the dialogs
Alex Fiestas [Sun, 6 Sep 2009 17:24:13 +0000 (17:24 +0000)]
Some UI tweaks in the dialogs

9 years agoAdded meta-info from dialog. Not polished yet
Alex Fiestas [Sun, 6 Sep 2009 17:13:07 +0000 (17:13 +0000)]
Added meta-info from dialog. Not polished yet

9 years agoYoutube manager no longuer exists
Alex Fiestas [Sun, 6 Sep 2009 15:31:31 +0000 (15:31 +0000)]
Youtube manager no longuer exists

9 years agoYoutubeManager morph into YoutubeJob :)
Alex Fiestas [Sun, 6 Sep 2009 15:29:58 +0000 (15:29 +0000)]
YoutubeManager morph into YoutubeJob :)

9 years agoCouple of fixes plus developer key moved to a define
Alex Fiestas [Sun, 6 Sep 2009 14:00:57 +0000 (14:00 +0000)]
Couple of fixes plus developer key moved to a define

9 years agoWhen the username/password are not correct, youtube plugin will ask you for a new...
Alex Fiestas [Sun, 6 Sep 2009 11:31:29 +0000 (11:31 +0000)]
When the username/password are not correct, youtube plugin will ask you for a new one.

9 years agoyoutube plugin now integrates with kwallet.
Alex Fiestas [Sun, 6 Sep 2009 10:59:31 +0000 (10:59 +0000)]
youtube plugin now integrates with kwallet.

9 years agoLogin String unhardcoded
Alex Fiestas [Sun, 6 Sep 2009 09:07:31 +0000 (09:07 +0000)]
Login String unhardcoded

9 years agoSlug has been unhardcoded too
Alex Fiestas [Sun, 6 Sep 2009 09:05:57 +0000 (09:05 +0000)]
Slug has been unhardcoded too

9 years agoUnhardcoded video path
Alex Fiestas [Sun, 6 Sep 2009 08:56:34 +0000 (08:56 +0000)]
Unhardcoded video path

9 years agoyoutube manager full working :) but moooooooooooooooooooooore work have to be done.
Alex Fiestas [Sun, 6 Sep 2009 08:09:24 +0000 (08:09 +0000)]
youtube manager full working :) but moooooooooooooooooooooore work have to be done.

9 years agoTODO updated, less things to be done!
Alex Fiestas [Sun, 6 Sep 2009 07:17:49 +0000 (07:17 +0000)]
TODO updated, less things to be done!

9 years agoRestored compatibility with KDE 4.3 (solid 4.3 doesn't have description method, we...
Alex Fiestas [Sun, 6 Sep 2009 07:14:19 +0000 (07:14 +0000)]
Restored compatibility with KDE 4.3 (solid 4.3 doesn't have description method, we've to use product() instead which is the same)

9 years agoYoutube plugin is able to upload files now :) the data is hardcoded and the architrec...
Alex Fiestas [Sun, 6 Sep 2009 06:26:22 +0000 (06:26 +0000)]
Youtube plugin is able to upload files now :) the data is hardcoded and the architrecture is not final so far.

9 years agoRemoved old traces of libv4l2 and kopeteav
Alex Fiestas [Sun, 6 Sep 2009 02:35:00 +0000 (02:35 +0000)]
Removed old traces of libv4l2 and kopeteav

9 years agoRemoved any trace of libgdata, at least until we decide what to do.
Alex Fiestas [Sun, 6 Sep 2009 02:34:31 +0000 (02:34 +0000)]
Removed any trace of libgdata, at least until we decide what to do.

9 years agoBurst mode now check if the timeInterval is minnor than 1 (1 second for each step...
Alex Fiestas [Sun, 6 Sep 2009 02:27:24 +0000 (02:27 +0000)]
Burst mode now check if the timeInterval is minnor than 1 (1 second for each step), and if it does set it as 1. Less interval have no sense for
burst mode.

9 years agoAdded a new start method to countdownwidget, wich have the timeInterval as argument...
Alex Fiestas [Sun, 6 Sep 2009 02:17:50 +0000 (02:17 +0000)]
Added a new start method to countdownwidget, wich have the timeInterval as argument. The old one start() will call the new one start(int).

9 years agoRemoved no-sense code commented.
Alex Fiestas [Sun, 6 Sep 2009 02:12:42 +0000 (02:12 +0000)]
Removed no-sense code commented.

9 years agoUps removed destructor of burstMode, the action is already delted in kamoso.
Alex Fiestas [Sat, 5 Sep 2009 07:03:09 +0000 (07:03 +0000)]
Ups removed destructor of burstMode, the action is already delted in kamoso.