Enrico Turri
1f79713c15
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-05 10:54:15 +02:00
bubnikv
adcf869eee
Fixed printer_variant fields for the i3 MK3 0.25 and 0.6mm nozzles.
2018-06-05 10:11:28 +02:00
bubnikv
1343a22dc6
Added Prusa profiles from https://raw.githubusercontent.com/prusa3d/Slic3r-settings/master/live/PrusaResearch
2018-06-04 15:58:44 +02:00
Enrico Turri
109dde00b2
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-04 12:25:04 +02:00
YuSanka
16a5029d58
Fixed issue #875 and updated Slic3rPE.pot
2018-06-04 12:13:07 +02:00
Enrico Turri
7d56b38e40
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-04 09:28:55 +02:00
Vojtech Kral
4df0b94b79
Beta bugfixes ( #931 )
...
* Fix: Function signature in avrdude
* Fix: Remove mockup vendor bundles
* Fix: Make ConfigWizard error handling more friendly
* Fix: Opening the datadir in AppImage-based Slic3r
2018-06-04 09:07:29 +02:00
YuSanka
85508fab82
Merge remote-tracking branch 'origin/master' into new_main_page_ui
2018-05-24 08:32:24 +02:00
Enrico Turri
486180c422
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-23 15:33:25 +02:00
YuSanka
a4261b11d4
Updated translations (de, fr, es, it & pl)
2018-05-23 14:22:52 +02:00
bubnikv
a9499ae45c
Fix of a crash intruduced with e8247c5646
2018-05-23 13:19:25 +02:00
Enrico Turri
37ab7594fc
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-23 08:38:29 +02:00
YuSanka
83cec1a640
Merge remote-tracking branch 'origin/master' into new_main_page_ui
2018-05-23 08:30:27 +02:00
bubnikv
076b293fec
Bumped up version numbers of the PrusaResearch.ini and the Slic3r itself.
2018-05-22 15:18:38 +02:00
Enrico Turri
4e29147756
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-22 11:48:45 +02:00
bubnikv
36b337b7e7
Moved max_print_height from [print:*common*] to [printer:*common*],
...
there is a bug still in Slic3r, it should refuse to load config keys
from a wrong location.
2018-05-22 11:45:15 +02:00
Eric
ca3ea125e2
Partial french translation ( #914 )
...
* partial french translation progress (45%)
* partial french translation progress (60%)
2018-05-22 11:01:05 +02:00
YuSanka
2a8391dfbf
Merge remote-tracking branch 'origin/master' into new_main_page_ui
2018-05-22 09:05:34 +02:00
Enrico Turri
59af3fb866
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-22 08:33:23 +02:00
Vojtech Kral
07817c8ee5
avrdude: Compilation on Windows/MSVC
2018-05-21 18:58:22 +02:00
Vojtech Kral
68a570221b
avrdude.conf: Remove unsupported stuff
2018-05-21 18:58:22 +02:00
Vojtech Kral
c7e4d1d06f
avrdude.conf base
2018-05-21 18:58:22 +02:00
Enrico Turri
7cff6ef6db
Shaders loaded from files
2018-05-21 13:08:02 +02:00
bubnikv
687c91d6e9
Parsing of obsolete presets from Config Bundle to remove them
...
from user's profile when upgrading to a new configuration structure.
2018-05-16 16:34:07 +02:00
YuSanka
e78a885247
Merge remote-tracking branch 'origin/master' into new_main_page_ui
2018-05-15 09:44:11 +02:00
YuSanka
b51197b52c
Updated POT-file, added Spanish and Polish, fixed bug with Ctrl+U,O,L in Italian
2018-05-14 13:56:40 +02:00
Lukas Matena
613bcf8055
Updated PrusaResearch.ini with the latest version from Slic3r-settings repository
2018-05-11 15:41:26 +02:00
Lukas Matena
5e231bf874
New wipe tower parameters added to INI file with profiles
2018-05-10 17:44:04 +02:00
YuSanka
2e7d623ee4
Created PrusaCollapsiblePane for CollapsiblePane view with disclosure triangles
2018-05-10 16:36:12 +02:00
YuSanka
16d5faac20
Preparations to the localization update & new Slic3rPE.pot
2018-05-02 16:06:35 +02:00
Vojtech Kral
dce0aa6771
Updating: Start using proper URLs
2018-04-25 17:43:01 +02:00
Vojtech Kral
03e9da804a
Update PrusaResearch bundle & index
2018-04-25 16:42:33 +02:00
Vojtech Kral
62d67d35ec
Merge branch 'profile_changes_reset' into updating
2018-04-24 18:15:23 +02:00
Vojtech Kral
fea5603409
PresetUpdater: Bundle incompatibility / Slic3r downgrade scnario
2018-04-24 18:06:42 +02:00
YuSanka
9a1dbfa6cf
Updated action_undo.png icon and added sys_unlock_grey.png & action_undo_grey.png for dark themes of OS
2018-04-23 10:27:42 +02:00
YuSanka
1e1bf03f61
Added reset buttons description
2018-04-20 12:58:07 +02:00
Vojtech Kral
2e61420747
Sync index file
2018-04-19 18:31:14 +02:00
Vojtech Kral
81c6ad3ab7
ConfigWizard: Add reset option, fixes
...
Fix mock vendors
2018-04-18 11:40:43 +02:00
Vojtech Kral
6286c9ee7c
ConfigWizard & updating: Fixes & cleanups
2018-04-17 11:54:59 +02:00
Vojtech Kral
214ad2925b
Merge branch 'master' into updating
2018-04-16 17:32:58 +02:00
bubnikv
b881ae936f
Updated preset from Jindra.
2018-04-13 18:36:52 +02:00
bubnikv
c5af8bfe78
Merged with Vojtech's branch
2018-04-13 16:19:27 +02:00
Vojtech Kral
7dbb2ed6a3
Configuration updates downloading
2018-04-13 15:24:55 +02:00
bubnikv
82890ec815
Removed some obsolete Perl binding.
...
Added Version Index "version" method.
Implemented automatic selection of default_print_profile and
default_filament_profile, when the print / filament profiles are
not compatible with the selected printer profile.
Fixed selection of a printer profile, if the currently selected
printer profile becomes invisible.
2018-04-13 14:49:33 +02:00
Vojtech Kral
b030791384
Semver fixes, misc fixes
2018-04-12 09:33:17 +02:00
bubnikv
aaa8f133c0
Fixed parsing of the config index.
2018-04-11 15:17:41 +02:00
YuSanka
762306d985
Added preset grouping to all presets ComboBoxes
...
Changed icons for action_undo, sys_lock and sys_unlock.
There are used same icons for all OS now.
Deleted/Commented temporarily used wxDataViewTreeCtrl
2018-04-11 13:56:37 +02:00
bubnikv
da2878958b
Wizard runs from the new Config menu,
...
snapshots could be rolled back / forward.
2018-04-11 12:21:15 +02:00
Vojtech Kral
90a8ef8e9f
Cleanup
2018-04-06 15:17:02 +02:00
Vojtech Kral
9dcec6662e
ConfigWizard: Other vendor sample data, minor fixes
2018-04-06 13:24:02 +02:00
Vojtech Kral
d1c1dcbe8f
ConfigWizard: Factor out a PrinterPicker widget, finalize other vendors page
2018-04-06 13:24:02 +02:00
Vojtech Kral
e53949f2c8
Apply printer model / variant preferences when loading presets
2018-04-06 13:24:02 +02:00
Vojtech Kral
3fcf194e39
ConfigWizard: Basic structure / WIP
2018-04-06 13:23:49 +02:00
YuSanka
53e100b890
Changed PrusaResearch.ini.
...
*(Uncommented "printer_model","printer_vendor", "printer_variant", "default_filament_profile")
* Added msg "It's system preset" to Dependencies
2018-03-23 09:41:52 +01:00
YuSanka
1c5970d0a2
Added sys_lock and sys_unlock icons.
2018-03-22 15:16:30 +01:00
YuSanka
08a8fe84a4
Merge remote-tracking branch 'origin/master' into profile_changes_reset
2018-03-22 14:18:48 +01:00
YuSanka
82f4e16a27
"Decorated" UI for options groups.
...
* Added prototype of undo-buttons for options groups;
* Fixed bugs with "decoration" updating after preset changing;
* Fixed wrong Ukrainian translation.
2018-03-21 22:21:37 +01:00
YuSanka
5c9ba1399f
Updated Czech to localization
2018-03-21 14:28:51 +01:00
YuSanka
c425169db0
Added Italian and updated German to localization
2018-03-21 14:00:06 +01:00
Vojtech Kral
c88d2780ce
Octoprint ( #796 )
...
* Octoprint: GUI for CA file, improvements
* Octoprint: Add GUI for Bonjour lookup, bugfixes
* Octoprint: Bonjour browser: Cleanup Perl interaction
* Octoprint: Bonjour: Perform several broadcast, UI fixes
* Octoprint: Add files to localization list
* Http: Disable CA File setting on SSL backends that don't support it
2018-03-15 18:06:26 +01:00
bubnikv
75230a790c
Prusa specific Config Bundle: Commented out the config values,
...
which this Slic3r version does not understand yet.
Fixes https://github.com/prusa3d/Slic3r/issues/795
2018-03-15 11:06:33 +01:00
YuSanka
d97a8f5740
Merge remote-tracking branch 'origin/master' into profile_changes_reset
2018-03-15 10:24:54 +01:00
bubnikv
7c027ee2ff
Removed the old Prusa specific config bundles.
2018-03-14 16:44:29 +01:00
YuSanka
a41e55a773
Merge remote-tracking branch 'origin/profile_inheritance' into profile_changes_reset
2018-03-14 16:34:51 +01:00
bubnikv
b62f721ea6
Replaced the Prusa specific config bundles with a single PrusaResearch.ini,
...
so the Wizard will now offer just a single file. This file was copied
from the profile_inheritance branch to test the new profile hierarchy
before the branch gets merged into the master.
2018-03-14 16:30:51 +01:00
bubnikv
56c2267d19
Merge branch 'gui_improvements'
2018-03-14 13:33:53 +01:00
bubnikv
e845f3b864
Merge branch 'master' into profile_inheritance
2018-03-13 13:49:23 +01:00
bubnikv
7f31f7a3ab
Added lock and lock_open icons.
2018-03-13 13:39:46 +01:00
bubnikv
729d879b0e
Added the Prusa's vendor specific Config Bundle.
...
Added the "unlocked lock" icon when the system profile gets modified.
2018-03-13 09:45:04 +01:00
Vojtech Kral
bd61c233a5
CMake target to generate the main pot file ( #786 )
2018-03-12 20:38:47 +01:00
bubnikv
f55becd43c
Introduced the system profiles.
...
The Config Wizard now just copies the Vendor's Config Bundle
into user_dir/vendor/ directory and Slic3r uses the configs
from the bundles found in user_dir/vendor directly.
2018-03-09 16:37:33 +01:00
bubnikv
83a2d2af4b
Separated the soluble settings from the printer profiles.
2018-03-08 12:27:20 +01:00
bubnikv
4e58c9dab9
Split the 0.25mm and 0.6mm nozzle parameters from the printer profiles.
2018-03-07 18:30:58 +01:00
bubnikv
f0fde26295
Implemented inheritance of profiles inside a config bundle.
...
Updated the Prusa's presets to match the initial flat config bundle.
2018-03-07 16:48:28 +01:00
bubnikv
77e142553a
First take on the config inheritance / config hierarchy.
2018-03-06 21:50:12 +01:00
YuSanka
d0d83526b4
Merge remote-tracking branch 'origin/master' into gui_improvements
2018-03-06 12:47:20 +01:00
YuSanka
4547755221
Update UI for visualize changes:
...
* Added changing of text color and inserted undo_button when some option is modified.
* Call wxSetlocale(LC_NUMERIC, "C") when do language changing.
2018-03-06 09:46:26 +01:00
bubnikv
5ea584280c
Merge remote-tracking branch 'remotes/origin/gui_improvements'
2018-03-05 12:12:40 +01:00
YuSanka
541b51c524
Merge dictionaries from the upstream Slic3r. Update existing dictionaries according to new Slic3rPE.pot
2018-02-28 15:44:45 +01:00
YuSanka
bcc68ca450
Added Slic3rPE.pot and list.txt to localization.
2018-02-26 08:31:07 +01:00
YuSanka
3e09e93037
Updated POfile for CS
2018-02-23 14:54:08 +01:00
YuSanka
baa5726532
All project is ready to localization.
...
* Macro _LC is changed to _CHB. [to put translated string into std::string correctly]
* Macro _LS is changed to L. [to mark string to translation]
* Standard wxWidgets macro _() is used for translation now.
* Updated POfile for EN
2018-02-23 14:25:49 +01:00
YuSanka
3d805a0f43
PreferencesDialog moved to C++ part
2018-02-22 11:12:29 +01:00
YuSanka
faca2d027b
Updated Slic3rPE.mo for CS & UK localization
2018-02-20 14:22:25 +01:00
YuSanka
bb7ec485f7
Updated Slic3rPE.mo for CS localization
2018-02-20 13:39:39 +01:00
YuSanka
f5ae470e5e
Completed translation to Ukrainian.
...
* Signs of degree are returned to UTF-8 in PrintConfig.
* Changed _LU8 macro. It's translated now like string explicitly specified as a string is already in UTF-8 encoding.
2018-02-19 15:32:22 +01:00
YuSanka
867e867cdd
Merge remote-tracking branch 'origin/master' into gui_translate_to_cpp
2018-02-19 08:41:41 +01:00
YuSanka
f330eb9567
Fixed set_value() bug. Fixed Infill density.
...
* Got rid of try/catch at PointCtrl::set_value().
* Optimized localization: got rid of redundant macro _LU8(s).
2018-02-19 00:01:11 +01:00
YuSanka
12b9a513c1
Escape from try/catch in Tab and OptionsGroup
...
* Deleted macro _LU8 from GUI.hpp. It's used only in Option class now.
* Added macro _LS to mark string used at localization (It returns same string)
2018-02-16 15:41:33 +01:00
bubnikv
f876946358
Merge remote-tracking branch 'origin/gui_translate_to_cpp'
2018-02-15 18:32:51 +01:00
YuSanka
7014902341
Updated *.po & *.mo files for EN & CS
2018-02-15 18:30:48 +01:00
bubnikv
f1840a52db
Merged the C++ port of the GUI Tabs / OptionGroup / Option classes
...
by @YuSanka, thanks @lordofhyphens for the initial port
of the OptionGroup / Option.
2018-02-15 18:13:37 +01:00
YuSanka
e0933786e3
Marked string used at localization.
...
* Correct save changed color
2018-02-15 17:30:33 +01:00
YuSanka
143f9d7d84
Added missing po-files
2018-02-08 10:59:43 +01:00
YuSanka
43aa1680cb
Added menu item for selection of application language from the list of installed languages.
...
* m_Local and its functions moved to GUI.cpp.
* Strings in some files(GUI.cpp, Tab.cpp, Tab.hpp & Field.cpp) marked by _L() macro.
* Updated mo-files for En and Uk languages.
2018-02-08 10:58:13 +01:00
YuSanka
28115a847c
First steps for implementing localization
...
* Created mo-files for Ukrainian and English languages
* For this moment it works only on BedShapeDialog.
2018-02-07 17:13:52 +01:00
bubnikv
4f427f8387
Updated the bundled Slic3r profiles to match the current stable release
...
profiles, adjusted the speed / acceleration / jerk limits to match
the current MK3 firmware.
2018-02-02 10:51:08 +01:00
bubnikv
fec1fcdca8
Separated the Marlin G-code flavor from the RepRap G-code flavor
...
due to the differences in the M203 code
(RepRap firmware has it in mm/min, Marlin in mm/sec).
This difference is important to the G-code time estimator.
Changed the g-code flavor to Marlin for all Prusa3D bundled profiles.
2018-01-06 18:49:28 +01:00
bubnikv
60a6e7ba8e
Included the velocity, acceleration and jerk settings into the Prusa3D
...
printer profiles.
2018-01-06 15:23:02 +01:00
bubnikv
7012c04005
Updated the printer profiles.
2018-01-06 15:06:21 +01:00
bubnikv
40a6125d73
Updated printer profiles.
2018-01-06 15:06:11 +01:00
bubnikv
d7998870c7
Bumped up the minimum firmware version of the MK3 printers to 3.1.1-RC4
2017-12-29 21:39:55 +01:00
bubnikv
a056eadc1e
Changed perimeter-infill overlap of the bundled Prusa i3 MK3 printer
...
profiles from 35% to 25%.
2017-12-29 21:15:20 +01:00
bubnikv
d9985c0575
Updated the initial presets for the MK3.
2017-12-21 20:15:51 +01:00
bubnikv
472946be32
Removed Original Prusa i3 MK3, MK2S, MK2 and MK2S-MMU.ini
2017-12-21 20:13:16 +01:00
bubnikv
e71b021b6e
Updated the bundled presets for the Prusa3D printers.
2017-12-21 19:26:29 +01:00
bubnikv
5a768ddd7b
Updated the bundled config profile with the new compatible_printers_condition.
2017-12-19 17:10:28 +01:00
bubnikv
455f9befbc
Moved the icons and images from Slic3r/var to Slic3r/resources/icons
...
to simplify installation of application static data
(icons, images and printer profiles) onto a target system.
2017-12-10 20:51:45 +01:00
bubnikv
98fdb46da9
Added a first config bundle for the Prusa MK2 & MK3 machines.
2017-12-10 13:21:06 +01:00