Skip to content

Commit

Permalink
0.1.8 (#20)
Browse files Browse the repository at this point in the history
* update knockout sortable library for OctoPrint 1.5.0 compatibility
* add release channels available in OctoPrint 1.5.0
* add resolution threshold in horizontal mode
* more fixes for themeify
  • Loading branch information
jneilliii authored Nov 22, 2020
1 parent 939d152 commit 7d5fb54
Show file tree
Hide file tree
Showing 6 changed files with 536 additions and 10 deletions.
20 changes: 20 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,25 @@ or manually using this URL:

https://github.com/jneilliii/OctoPrint-ConsolidateTempControl/archive/master.zip

## Most recent changelog

**[0.1.8](https://github.com/jneilliii/OctoPrint-ConsolidateTempControl/releases/tag/0.1.8)** (11/22/2020)

**Added**

* resolution threshold option for horizontal mode to switch to vertical mode automatically
* release channels for OctoPrint 1.5.0+ for future rc testing, similar to OctoPrint as described [here](https://community.octoprint.org/t/how-to-use-the-release-channels-to-help-test-release-candidates/402)

**Updated**

* knockout sortable library for OctoPrint 1.5.0 compatibility

**Fixed**

* conflicts with Themeify and DragonOrder

### [All releases](https://github.com/jneilliii/OctoPrint-ConsolidateTempControl/releases)

## Get Help

If you experience issues with this plugin or need assistance please use the issue tracker by clicking issues above.
Expand All @@ -33,6 +52,7 @@ Check out my other plugins [here](https://plugins.octoprint.org/by_author/#jneil
- @tideline3d
- [SimplyPrint](https://simplyprint.dk/)
- [Andrew Beeman](https://github.com/Kiendeleo)
- [Calanish](https://github.com/calanish)

### Support My Efforts
I, jneilliii, programmed this plugin for fun and do my best effort to support those that have issues with it, please return the favor and leave me a tip or become a Patron if you find this plugin helpful and want me to continue future development.
Expand Down
14 changes: 12 additions & 2 deletions octoprint_consolidate_temp_control/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class ConsolidateTempControlPlugin(octoprint.plugin.TemplatePlugin,

##-- Settings mixin
def get_settings_defaults(self):
return dict(tab_order=[dict(name="Temperature",selector="#temp"),dict(name="Control",selector="#control")], layout="horizontal", resize_navbar=True)
return dict(tab_order=[dict(name="Temperature",selector="#temp"),dict(name="Control",selector="#control")], layout="horizontal", resize_navbar=True, resolution_threshold=0)

##-- Template mixin
def get_template_configs(self):
Expand All @@ -20,7 +20,7 @@ def get_template_configs(self):

##-- AssetPlugin mixin
def get_assets(self):
return dict(js=["js/jquery-ui.min.js","js/knockout-sortable.js","js/consolidate_temp_control.js"])
return dict(js=["js/jquery-ui.min.js","js/knockout-sortable.1.2.0.js","js/consolidate_temp_control.js"])

##~~ Softwareupdate hook
def update_hook(self):
Expand All @@ -34,6 +34,16 @@ def update_hook(self):
user="jneilliii",
repo="OctoPrint-ConsolidateTempControl",
current=self._plugin_version,
stable_branch=dict(
name="Stable", branch="master", comittish=["master"]
),
prerelease_branches=[
dict(
name="Release Candidate",
branch="rc",
comittish=["rc", "master"],
)
],

# update method: pip
pip="https://github.com/jneilliii/OctoPrint-ConsolidateTempControl/archive/{target_version}.zip"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ $(function() {
});
$('#temp_link, #control_link').remove();

if(self.settings.settings.plugins.consolidate_temp_control.layout() == 'horizontal'){
if(self.settings.settings.plugins.consolidate_temp_control.layout() == 'horizontal' && (screen.width >= parseInt(self.settings.settings.plugins.consolidate_temp_control.resolution_threshold(), 10) && self.settings.settings.plugins.consolidate_temp_control.resolution_threshold() >= 0)){
// page container adjustments
$('div.page-container').css({'min-width':'1900px'});

Expand All @@ -44,7 +44,9 @@ $(function() {

// sidebar adjustments
if (!self.dragonorder) {
$('div.container.octoprint-container > div.row > div.accordion.span4').removeClass('span4').addClass('span2');
if($('div#settings_plugin_themeify').length == 0){
$('div.container.octoprint-container > div.row > div.accordion.span4').removeClass('span4').addClass('span2');
}
$('#files div.row-fluid.upload-buttons > span.btn.btn-primary.fileinput-button.span6:nth-child(2) > span').text('Upload SD');
}

Expand Down Expand Up @@ -129,7 +131,7 @@ $(function() {
self.temperatureViewModel.updatePlot();
}
self.temperatureViewModel.onAfterTabChange("#temp", previous);
}
}
}
}

Expand All @@ -139,4 +141,4 @@ $(function() {
optional: ["touchUIViewModel", "dragon_orderViewModel", "WebcamTabViewModel"],
elements: ["#consolidate_temp_control_settings_form"]
});
});
});
Loading

0 comments on commit 7d5fb54

Please sign in to comment.