Commit Graph
100 Commits
Author SHA1 Message Date
Kjell Kernen 8ce52f9d5e A few new splash screens for Taranis 2014-02-28 00:09:50 +01:00
Kjell Kernen 756c6b37cc Merge pull request #761 from opentx/dvogonen/fix_756
Fixes #756
2014-02-28 00:03:47 +01:00
Kjell Kernen 8277e8bef1 Fixes #756 2014-02-28 00:02:30 +01:00
Kjell Kernen baffeeb5b0 Taranis splash image changes 2014-02-27 13:41:48 +01:00
Kjell Kernen d57697460b Cleaned tabs from code. The ones in mainwindow.cpp are mine. The rest come from other contributors. 2014-02-26 15:23:42 +01:00
Kjell Kernen f7e741b4e2 Pict upddates 2014-02-26 03:11:33 +01:00
Kjell Kernen 5ece7d9934 Moved selection of radio type from download dialog to profile tab. This was a bit tricky. 2014-02-26 01:38:13 +01:00
Kjell Kernen ca3127fdc1 Merge pull request #746 from opentx/dvogonen/clean_up_splash_library
Splash library updated
2014-02-24 15:40:46 +01:00
Kjell Kernen 91f8157f03 Renaming files to change order 2014-02-24 14:41:05 +01:00
Kjell Kernen 575ea504aa Updated QT resource file with new image names 2014-02-24 14:28:19 +01:00
Kjell Kernen dc37677cc6 Removing ER9x and Open9x specific imagery 2014-02-24 12:22:46 +01:00
Kjell Kernen bebb067ee3 Merge pull request #736 from opentx/dvogonen/fix_companion_gui_bugs
Fixed a few minor issues. It seems larger since I had to reformat an entire source file. One of my editors had mangled it and inserted tabs everywhere. Hate that.
2014-02-22 15:30:03 +01:00
Kjell Kernen 0e09e1e270 Merge pull request #728 from opentx/dvogonen/making_settings_type_safe
Merging this one myself since both Bertrand and I have been throug it over and over. Better merge it fast before something else changes and forces new changes.
2014-02-21 10:14:09 +01:00
Kjell Kernen 5842bc8473 First merge problem fixed (there are more) 2014-02-20 22:33:41 +01:00
Kjell Kernen de3e0e802f Merge pull request #703 from opentx/bsongis/standalone_simu
Bsongis/standalone simu
2014-02-20 21:18:14 +01:00
Kjell Kernen e87bec64e3 Merge pull request #727 from opentx/dvogonen/use_correct_icons
Now it is possible to see Martins beautiful new icons in a number of the dialogs.
2014-02-20 15:35:59 +01:00
Kjell Kernen 73621e1f75 Merge pull request #726 from opentx/mhotar/companion_new_theme
Mhotar/companion new theme
2014-02-19 18:58:25 +01:00
Kjell Kernen 80ef2b8d38 All function names changed to a consistent standard.
Cleaned up indentation of appdata.h
2014-02-19 14:01:34 +01:00
Kjell Kernen 82910acffe Merge branch 'origin/next' 2014-02-19 00:41:45 +01:00
Kjell Kernen da68c593cf Changed every single QSetting in Companion.
Next step: Function renaming
2014-02-18 23:48:57 +01:00
Kjell Kernen f617ae1362 Modeledit added 2014-02-18 00:25:04 +01:00
Kjell Kernen 2616961b95 Merge branch 'origin/next' 2014-02-17 23:49:08 +01:00
Kjell Kernen c23a096a73 Almost all global settings wrapped in protective object to guarantee type safety and protect against tag spelling errors (I have found and corrected a lot of those!).
Joystick settings and burner configuration is not yet within the global object.
2014-02-17 23:47:40 +01:00
Kjell Kernen 2633b61433 Profiles working.
Next all duplicated variables will be removed from global and only exists in profile.
2014-02-17 15:28:50 +01:00
Kjell Kernen fdc9873ab8 Profile date is now type safe. Semi working, not complete yet. 2014-02-17 01:16:24 +01:00
Kjell Kernen acbe17e4bc Main and the preferences dialog are done.
At least as far as the simple values. I have not made support for complex values like profiles yet.
2014-02-16 18:17:10 +01:00
Kjell Kernen ea3f47c7f2 I will wrap the unsafe global settings operations in a application data object.
I have found several bugs in the current model, where settings labels have been spelled badly or been of the wrong type.
2014-02-16 16:48:55 +01:00
Kjell Kernen d2674a5ba1 Merge pull request #709 from opentx/dvogonen/add_finnish_to_companion_menu_languages
Dvogonen/add finnish to companion menu languages
2014-02-15 12:17:44 +01:00
Kjell Kernen c4c67658b4 Last pieces in place to support Finnish 2014-02-15 12:15:33 +01:00
Kjell Kernen 745161ee6e Merge branch 'origin/next' 2014-02-15 12:01:03 +01:00
Kjell Kernen 81fd67585e Merge pull request #706 from opentx/driver33/PL_Translation
changes in translation of Companion and adding Finish transaltion RAW fi...
2014-02-15 12:00:06 +01:00
Kjell Kernen 26c1bc0725 Added Finnish to menu languges 2014-02-15 11:47:15 +01:00
Kjell Kernen 24f30bf5e1 Added fi.h to ignored temp files 2014-02-15 10:14:05 +01:00
Kjell Kernen e19df39c0e Changing function names to make the code easier to read and understand.
I am looking at simplifying the code for reading and writing firmware. There seems to be a few bugs...
2014-02-15 02:42:48 +01:00
Kjell Kernen 3d542a0ded Full support for Finnish language in OpenTX 2014-02-14 17:18:23 +01:00
Kjell Kernen ba5a9c723e Updated swedish translation with all the latest strings 2014-02-14 16:24:04 +01:00
Kjell Kernen b5af24e8c9 Merge pull request #699 from opentx/dvogonen/cleaning_up_code
Cleaned up the action definitions in Companion.
2014-02-13 22:15:56 +01:00
Kjell Kernen 3084ad12c5 Cleaned up the action definitions. 2014-02-13 22:13:49 +01:00
Kjell Kernen 2c605e8280 Merge pull request #693 from opentx/dvogonen/menu_selections_are_invisible
Companion menu selections are now marked the proper way for each OS.
2014-02-13 00:07:56 +01:00
Kjell Kernen 6f807b007b Companion menu selections are now marked the propper way for each operating system. Previously they were marked in nonstandard ways or not at all. 2014-02-13 00:05:22 +01:00
Kjell Kernen 26d9455b8a A bunch of new icons for the New Theme 2014-02-12 16:11:43 +01:00
Kjell Kernen a0dbfddad0 Merge pull request #692 from opentx/dvogonen/add_new_icon_theme
New icon theme added
2014-02-12 13:23:41 +01:00
Kjell Kernen 4ca9aba433 New icon theme added 2014-02-12 13:22:46 +01:00
Kjell Kernen fab041ce16 Reverted all classical icon theme icons 2014-02-12 10:52:58 +01:00
Kjell Kernen 53b8825d03 Originals for classic icon theme reverted. 2014-02-12 10:49:14 +01:00
Kjell Kernen 9a47c9d067 Merge pull request #690 from opentx/dvogonen/splasheditor_width_bug
Merging this so I can close my two conflicting branches.
2014-02-12 01:28:44 +01:00
Kjell Kernen 64573dd571 Merge branch 'origin/next' 2014-02-12 01:21:59 +01:00
Kjell Kernen 94720b0c4e Fixes width bug for 212 wide images. 2014-02-12 01:11:30 +01:00
Kjell Kernen 48af7aefd0 Made the Splash editor respect the 9x/Taranis LCD widths in a consistent way. Previously everything was displayed as a Taranis bitmap.
Pictures larger than 9x width will get scaled to Taranis width (212 pix).
2014-02-11 18:08:54 +01:00
Kjell Kernen 18a2af7291 A few bug fixes and an updated Swedish translation. 2014-02-11 14:03:03 +01:00
Kjell Kernen eedc5ea68f Profiles can now be added and removed in a proper way. 2014-02-11 08:37:07 +01:00
Kjell Kernen 58e213f578 Merge branch 'origin/next' 2014-02-11 04:38:03 +01:00
Kjell Kernen 70ddd2911a Merge pull request #676 from opentx/driver33/PL_Translation
Fixes (reverted from commit 1a6832c83a)
2014-02-10 20:41:29 +01:00
Kjell Kernen b74d7f0f32 Added code for creating new profiles. 2014-02-10 18:01:43 +01:00
Kjell Kernen d5e22111e1 App Preferences dialog tabs fully functional, except for adding profiles.
Splash Editor fully functional. Improved handling of image formats remain.
Merged branch 'origin/next'
2014-02-10 16:59:49 +01:00
Kjell Kernen c48e1781fd The profile tab is now functional 2014-02-10 07:54:42 +01:00
Kjell Kernen 07a6fd8ee7 Alternative testable tab based setting version. 2014-02-09 14:30:50 +01:00
Kjell Kernen 7ef7436118 Fixes #495
Added link to OpenTX documentation page in the help menu
2014-02-09 01:12:01 +01:00
Kjell Kernen b99cb4c431 Import and Export of profiles removed. 2014-02-09 00:35:46 +01:00
Kjell Kernen 417ab94993 Merge branch 'origin/next' 2014-02-08 17:03:48 +01:00
Kjell Kernen 5c70c2f415 Moved fields around in the fwPref dialog to make it clear what affects the current settings (profile) and what configures the download. 2014-02-08 16:41:06 +01:00
Kjell Kernen db1a459a47 Updated translation 2014-02-07 17:19:29 +01:00
Kjell Kernen 23a61cc60e Merge branch 'origin/next'
Conflicts:
	companion/src/translations/companion_pl.ts
2014-02-07 17:10:40 +01:00
Kjell Kernen 98779da0cf Editor getting some functionality 2014-02-07 17:06:11 +01:00
Kjell Kernen c7b7cd2ba9 Splash Editor modified 2014-02-06 20:52:17 +01:00
Kjell Kernen 9badcb3513 Merge branch 'origin/next'
Conflicts:
	companion/src/apppreferencesdialog.cpp
	companion/src/apppreferencesdialog.h
	companion/src/apppreferencesdialog.ui
	companion/src/fwpreferencesdialog.ui
	companion/src/imgpreferences.ui
	companion/src/mainwindow.cpp
2014-02-06 18:15:12 +01:00
Kjell Kernen 7b8a7ffd58 Split of preferences completed.
Old preferences still left for testing (last checking with that).
Work started on updating the splash editor.
2014-02-06 17:59:58 +01:00
Kjell Kernen 2d241ea9d9 Preference dialog split into two dialogs.
Both the two new dialogs and the old one are active and working at the same time. The old one will be removed when everything is in place.
New preference icons are added for classical theme.
Placeholder icons added for all monochrome themes.
The only thing not moved is the splash screen functionality. It does not really fit in either dialog and there are allready another special dialog for customizing splash screens. Perhaps make a combined dialog for all splash screen work? Will think about it tomorrow.
2014-02-06 00:00:22 +01:00
Kjell Kernen 1f7be79a92 Revert "Two new dialogs defined."
This reverts commit d9f97016e2.
2014-02-05 17:48:01 +01:00
Kjell Kernen 06bb5ab175 Merge branch 'origin/next' 2014-02-05 17:46:12 +01:00
Kjell Kernen d9f97016e2 Two new dialogs defined. 2014-02-05 17:44:49 +01:00
Kjell Kernen bb3335b555 Updated translation files 2014-02-04 22:47:14 +01:00
Kjell Kernen 191c11056a Merge branch 'next' 2014-02-04 22:40:59 +01:00
Kjell Kernen cf6a56b64a Merge branch 'origin/next' 2014-02-04 22:38:03 +01:00
Kjell Kernen 0ecadadeb4 Settings menu created which will hold all configurations and settings.
Language, theme and icon size broken out of the preferences and put into the menu, where they belong.
2014-02-04 22:37:13 +01:00
Kjell Kernen 71ef6d5457 Changed names for Master/Slave in Swedsih translation 2014-02-03 23:17:55 +01:00
Dvogonen b8f3e1771d Corrected an image problem with a section being slightly "blacker" than the black surrounding it. Pushing directly to next. 2014-02-03 13:58:19 +01:00
Kjell Kernen e0fe763832 Merge pull request #647 from opentx/dvogonen/renaming_even_more_CS_to_LS
Changed CS labels in xsimulator to LS labels
2014-02-03 04:52:12 -08:00
Dvogonen 5960f25878 Changed CS labels in xsimulator to LS labels 2014-02-03 13:50:19 +01:00
Kjell Kernen 719aa2ee49 Merge pull request #646 from opentx/dvogonen/rename_another_screenful_of_CS_to_LS
Renamed the CS labels in the simulator dialog to LS
2014-02-03 03:09:13 -08:00
Dvogonen 1b071cbf47 Renamed the CS labels in the simulator dialog to LS 2014-02-03 12:07:52 +01:00
Kjell Kernen 210c03e0a1 Merge pull request #645 from opentx/dvogonen/swedish_translation_branch
Translated latest strings to Swedish and made minor improvements
2014-02-03 02:55:22 -08:00
Dvogonen 2b878af183 TRanslated latest strings and made minor improvements 2014-02-03 11:53:40 +01:00
Kjell Kernen 2c9f601404 Merge pull request #633 from opentx/dvogonen/OpenTX_-build_broken_in_next_632
Dvogonen/open tx  build broken in next 632
2014-02-01 09:51:54 -08:00
Dvogonen 63193951e9 Added black outlines to 24x24, 32x32 and 48x48 icons to improve visibility
Replaced 16x16 icons whith monoblack icons, to make them visible in menus
2014-01-27 15:11:03 +01:00
Kjell Kernen bf8e74b266 Merge pull request #597 from opentx/dvogonen/swedish_translation_branch_do_not_remove
Merged a couple of translations
2014-01-24 13:19:39 -08:00
Dvogonen 8b33ba4576 Merge branch 'origin/next' 2014-01-24 09:13:45 +01:00
Dvogonen d1b95610e2 Updated logos with new official green color 009000 2014-01-21 17:03:49 +01:00
Dvogonen e7a8de750c Removed unused icons 2014-01-21 16:20:17 +01:00
Dvogonen 9829059e66 Fixed dual definition of application name and cleaned up code. This fixes a problem with dual config files beeing written in next. 2014-01-21 15:20:50 +01:00
Dvogonen 2925ab29a9 Merge branch 'origin/next' 2014-01-21 14:57:13 +01:00
Dvogonen 84e02706e7 Merge branch 'origin/next'
Conflicts:
	companion/src/helpers.cpp
2014-01-21 10:04:52 +01:00
Dvogonen 9d1d36cd3b Added white theme 2014-01-21 09:56:19 +01:00
Dvogonen ba71d4ebda New README 2014-01-20 16:44:02 +01:00
Dvogonen ffeb7cd6b2 Adding the new theme files to the resources 2014-01-20 16:07:36 +01:00
Dvogonen 3acb7e5eff All the icons and a script conversion file added. 2014-01-20 15:16:42 +01:00
Dvogonen 9cc9e115a4 Icons regenerated to correct font related problem. 2014-01-13 14:02:39 +01:00
kjell.kernen@gmail.com e7a7916d8a Realigned to exactly match the lines in en.h 2013-10-10 12:46:39 +00:00
kjell.kernen@gmail.com dd3a41e4ce Translated the new MAVLINK strings. 2013-10-10 12:41:46 +00:00
kjell.kernen@gmail.com 4f55c6d3aa Fix for issue 154. Bad name for ONE switch function in Swedish translation 2013-10-03 19:58:47 +00:00