diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 7650530fa5cb..d811815ab914 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -62,7 +62,7 @@ changes (where available). - Added a high-contrast theme with bright white text on a dark gray background. -- Enhanced tooltips for utiltity module headers to provide more +- Enhanced tooltips for utility module headers to provide more information about the module. - Added more hints on an empty lighttable. diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in index 8bab07b540bf..7f483fcf72e5 100644 --- a/cmake/modules/NSIS.template.in +++ b/cmake/modules/NSIS.template.in @@ -385,7 +385,7 @@ Function un.RemoveFromPath FunctionEnd ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; Uninstall sutff +; Uninstall stuff ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ########################################### diff --git a/packaging/macosx/3_make_hb_darktable_package.sh b/packaging/macosx/3_make_hb_darktable_package.sh index 50752302c982..435e403cc340 100755 --- a/packaging/macosx/3_make_hb_darktable_package.sh +++ b/packaging/macosx/3_make_hb_darktable_package.sh @@ -56,11 +56,11 @@ function install_dependencies { dynDepOrigFile=$(basename "$hbDependency") dynDepTargetFile="$dtResourcesDir/lib/$dynDepOrigFile" - # Install dependency if not yet existant + # Install dependency if not yet existent if [[ ! -f "$dynDepTargetFile" ]]; then echo "Installing dependency $hbDependency of $1" - # Copy dependency as not yet existant + # Copy dependency as not yet existent cp -L "$hbDependency" "$dynDepTargetFile" # Handle transitive dependencies diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8226d6be8d76..91966d403616 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -772,7 +772,7 @@ endif(USE_LUA) if(USE_LUA) if(NOT Lua54_FOUND) - list(APPEND LIB_DEPS lua) # 2nd half of the uglyness :/ + list(APPEND LIB_DEPS lua) # 2nd half of the ugliness :/ endif(NOT Lua54_FOUND) # liblautoc for lua automated interface generation add_library(lautoc_static STATIC IMPORTED) diff --git a/src/control/jobs.h b/src/control/jobs.h index 64e5c868da0f..ffbd0a24373a 100644 --- a/src/control/jobs.h +++ b/src/control/jobs.h @@ -49,7 +49,7 @@ typedef enum dt_job_queue_t DT_JOB_QUEUE_USER_EXPORT = 3, // exports. only one of these jobs will ever be scheduled at a time DT_JOB_QUEUE_SYSTEM_BG = 4, // some lua stuff that may not be pushed out of the queue, ... DT_JOB_QUEUE_MAX = 5, - DT_JOB_QUEUE_SYNCHRONOUS = 1000 // don't queue, run immeidately and don't return until done + DT_JOB_QUEUE_SYNCHRONOUS = 1000 // don't queue, run immediately and don't return until done } dt_job_queue_t; typedef struct _dt_job_t dt_job_t; diff --git a/src/control/signal.h b/src/control/signal.h index 225c1cc65d1f..4f5f1e5fad24 100644 --- a/src/control/signal.h +++ b/src/control/signal.h @@ -293,7 +293,7 @@ typedef enum dt_debug_signal_action_t DT_DEBUG_SIGNAL_ACT_PRINT_TRACE = 1 << 3, } dt_debug_signal_action_t; -/* inititialize the signal framework */ +/* initialize the signal framework */ struct dt_control_signal_t *dt_control_signal_init(); /* raises a signal */ void dt_control_signal_raise(const struct dt_control_signal_t *ctlsig, const dt_signal_t signal, ...); diff --git a/src/develop/blend_gui.c b/src/develop/blend_gui.c index bfa61f69ef8c..2ae46a4963d8 100644 --- a/src/develop/blend_gui.c +++ b/src/develop/blend_gui.c @@ -2124,7 +2124,7 @@ static void _blendop_blendif_channel_mask_view(GtkWidget *widget, dt_dev_pixelpipe_display_mask_t new_request_mask_display = module->request_mask_display | mode; - // in case user requests channel display: get the cannel + // in case user requests channel display: get the channel if(new_request_mask_display & DT_DEV_PIXELPIPE_DISPLAY_CHANNEL) { dt_dev_pixelpipe_display_mask_t channel = data->channel[data->tab].display_channel; @@ -2170,7 +2170,7 @@ static void _blendop_blendif_channel_mask_view_toggle new_request_mask_display &= ~DT_DEV_PIXELPIPE_DISPLAY_ANY; - // in case user requests channel display: get the cannel + // in case user requests channel display: get the channel if(new_request_mask_display & DT_DEV_PIXELPIPE_DISPLAY_CHANNEL) { dt_dev_pixelpipe_display_mask_t channel = data->channel[data->tab].display_channel; @@ -2583,7 +2583,7 @@ void dt_iop_gui_init_blendif(GtkWidget *blendw, dt_iop_module_t *module) gtk_notebook_set_scrollable(bd->channel_tabs, TRUE); gtk_box_pack_start(GTK_BOX(header), GTK_WIDGET(bd->channel_tabs), TRUE, TRUE, 0); - // a little padding between the notbook with all channels and the icons for pickers. + // a little padding between the notebook with all channels and the icons for pickers. gtk_box_pack_start(GTK_BOX(header), gtk_label_new(""), FALSE, FALSE, DT_PIXEL_APPLY_DPI(10)); diff --git a/src/develop/pixelpipe_cache.c b/src/develop/pixelpipe_cache.c index eafa7787dbb1..d771a329b820 100644 --- a/src/develop/pixelpipe_cache.c +++ b/src/develop/pixelpipe_cache.c @@ -441,7 +441,7 @@ void dt_dev_pixelpipe_cache_checkmem(struct dt_dev_pixelpipe_t *pipe) // alternating buffers so no cleanup if(cache->entries == DT_PIPECACHE_MIN) return; - // We always free cachelines maked as not valid + // We always free cachelines marked as not valid size_t freed = 0; for(int k = DT_PIPECACHE_MIN; k < cache->entries; k++) diff --git a/src/dtgtk/culling.c b/src/dtgtk/culling.c index 7b6a152cd48e..4cbaed64a0ed 100644 --- a/src/dtgtk/culling.c +++ b/src/dtgtk/culling.c @@ -1394,14 +1394,14 @@ static gboolean _thumbs_compute_positions(dt_culling_t *table) } // Vertical image stacking: - // Vertical stacking is only allowed if the heigth of the biggest thumbnail is more than the height + // Vertical stacking is only allowed if the height of the biggest thumbnail is more than the height // of 2 or more thumbs combined. // for example: we have three images and image 2 is higher than heights of image 1 and 3 combined // [ 1 ] | 2 | | 2 | // [ 3 ] | 2 | instead of this placement --> [ 1 ] | 2 | [ 3 ] // | 2 | | 2 | // in this case, images 1 and 3 would be stacked in one slot and image 2 will be placed in a new slot alone. - // if all images have similar heigths, they will not be stacked and placed in separate slots. + // if all images have similar heights, they will not be stacked and placed in separate slots. // Note: Stacking only make sense for images in the same row as the portrait image. // The algorithm does not check for this so unnecessary stacking can occur. @@ -1457,8 +1457,8 @@ static gboolean _thumbs_compute_positions(dt_culling_t *table) const int number_of_slots = g_list_length(slots); // finished assigning thumbnails to slots - // we also know max slot height, so we can now scale all slots to this heigth - // and then calculate average slot heigth and width + // we also know max slot height, so we can now scale all slots to this height + // and then calculate average slot height and width int slot_counter = 0; float avg_slot_aspect_r = 0.0f; int total_slot_width = 0; @@ -1475,7 +1475,7 @@ static gboolean _thumbs_compute_positions(dt_culling_t *table) int scaled_slot_height = 0; int scaled_slot_width = 0; - // calculate current slot heigth for upscaling + // calculate current slot height for upscaling for(GList *slot_thumb_iter = slot; slot_thumb_iter; slot_thumb_iter = g_list_next(slot_thumb_iter)) @@ -1631,7 +1631,7 @@ static gboolean _thumbs_compute_positions(dt_culling_t *table) dt_thumbnail_t *thumb = (dt_thumbnail_t *)slot_thumb_iter->data; thumb->x = thumb_x + (slot_max_thumb_width - thumb->width) / 2; // x position should be horizontally centered within the slot thumb->y = thumb_y; // y position starts at 0 - thumb_y += thumb->height + spacing; // and is increased by the heigth of the thumb + spacing of spacing for placing the next image of the slot + thumb_y += thumb->height + spacing; // and is increased by the height of the thumb + spacing of spacing for placing the next image of the slot } rows->data = g_list_append(rows->data, slot); // append slot to row row_heigth = MAX(row_heigth, thumb_y - row_y); @@ -1669,7 +1669,7 @@ static gboolean _thumbs_compute_positions(dt_culling_t *table) int slot_heigth = 0; // loop through thumbs of the slot - // to calculate slot heigth and update row width and heigth + // to calculate slot height and update row width and height // which is used for xoffset of row and yoffset of individual thumbs for(GList *slot_thumb_iter = slot; slot_thumb_iter; @@ -1734,7 +1734,7 @@ static gboolean _thumbs_compute_positions(dt_culling_t *table) thumb->y = thumb->y * factor + yoff; dt_print(DT_DEBUG_LIGHTTABLE, - "[culling_placement] thumb_id=%d, x=%d, y=%d, width=%d, heigth=%d" + "[culling_placement] thumb_id=%d, x=%d, y=%d, width=%d, height=%d" " - table_width=%d, table_height=%d\n", thumb->imgid, thumb->x, thumb->y, thumb->width, thumb->height, table->view_width, table->view_height); diff --git a/src/dtgtk/thumbtable.c b/src/dtgtk/thumbtable.c index 2f3e789cac59..3a7762ec2700 100644 --- a/src/dtgtk/thumbtable.c +++ b/src/dtgtk/thumbtable.c @@ -1934,7 +1934,7 @@ static void _dt_collection_changed_callback(gpointer instance, GList *actual = NULL; if(nrow <= 0) { - // we retrive the entry with id == newid + // we retrieve the entry with id == newid for(GList *l = table->list; l; l = g_list_next(l)) { dt_thumbnail_t *thumb = (dt_thumbnail_t *)l->data; diff --git a/src/iop/channelmixerrgb.c b/src/iop/channelmixerrgb.c index 480355d0327a..eb3869280fc0 100644 --- a/src/iop/channelmixerrgb.c +++ b/src/iop/channelmixerrgb.c @@ -469,8 +469,8 @@ void init_presets(dt_iop_module_so_t *self) // film emulations - /* These emulations are built using spectral sensitivies provided by - * film manufacturers for tungsten light, corrected in spectral + /* These emulations are built using spectral sensitivities provided + * by film manufacturers for tungsten light, corrected in spectral * domain for D50 illuminant, and integrated in spectral space * against CIE 2° 1931 XYZ color matching functions in the Python lib * Colour, with the following code : diff --git a/src/iop/graduatednd.c b/src/iop/graduatednd.c index aa43b0d85274..3a2cf8e3ddf5 100644 --- a/src/iop/graduatednd.c +++ b/src/iop/graduatednd.c @@ -620,7 +620,7 @@ int mouse_moved(dt_iop_module_t *self, { g->selected = 0; const float ext = DT_PIXEL_APPLY_DPI(0.02f) / zoom_scale; - // are we near extermity ? + // are we near extremity ? if(pzy > g->ya - ext && pzy < g->ya + ext && pzx > g->xa - ext && pzx < g->xa + ext) { g->selected = 1; diff --git a/src/iop/liquify.c b/src/iop/liquify.c index 958565183e9b..b2b3cb132c95 100644 --- a/src/iop/liquify.c +++ b/src/iop/liquify.c @@ -1807,7 +1807,7 @@ static void _draw_paths(dt_iop_module_t *module, cairo_set_line_cap(cr, CAIRO_LINE_CAP_ROUND); const gboolean showhandle = dt_iop_canvas_not_sensitive(darktable.develop) == FALSE; - // do not display any iterpolated items as slow when: + // do not display any interpolated items as slow when: // - we are dragging (pan) // - the button one is pressed // - exception for DT_LIQUIFY_LAYER_STRENGTHPOINT where we want to see the diff --git a/src/iop/rawprepare.c b/src/iop/rawprepare.c index 5f530a45b6d0..205e96a26859 100644 --- a/src/iop/rawprepare.c +++ b/src/iop/rawprepare.c @@ -632,7 +632,7 @@ static gboolean _image_set_rawcrops( else dt_iop_set_module_trouble_message(self, NULL, NULL, NULL); - // we update p_width & height both in the image_storage for fast access withing the pipeline + // we update p_width & height both in the image_storage for fast access within the pipeline // and the database so we can access that also via dt_image_cache_get() dt_image_t *image = dt_image_cache_get(darktable.image_cache, imgid, 'w'); image->p_width = img->p_width = img->width - (cropvalid ? left + right : 0); diff --git a/src/iop/temperature.c b/src/iop/temperature.c index be531be71506..f83b1f3848c9 100644 --- a/src/iop/temperature.c +++ b/src/iop/temperature.c @@ -465,7 +465,7 @@ static void _temp2mul(dt_iop_module_t *self, xyz.Y /= tint; // TODO: This is baaad! /** * TODO: - * problem here is that tint as it is is just a nasty hack modyfying Y component + * problem here is that tint as it is is just a nasty hack modifying Y component * and therefore changing RGB coefficients in wrong way, * because modifying only Y in that way doesn’t move XYZ point orthogonally * to planckian locus. That means it actually changes temperature and thus it lies! diff --git a/src/win/scandir.c b/src/win/scandir.c index c6c1334465d8..2b039ae9ae95 100644 --- a/src/win/scandir.c +++ b/src/win/scandir.c @@ -22,7 +22,7 @@ The original implementation of scandir has been made by Richard Salz. The original author put this code in the public domain. - It has been modified to simplify slightly and increae readability. + It has been modified to simplify slightly and increase readability. */ #include diff --git a/src/win/scandir.h b/src/win/scandir.h index eb748a234e58..e8f1cf37f19f 100644 --- a/src/win/scandir.h +++ b/src/win/scandir.h @@ -22,7 +22,7 @@ The original implementation of scandir has been made by Richard Salz. The original author put this code in the public domain. - It has been modified to simplify slightly and increae readability. + It has been modified to simplify slightly and increase readability. */ #pragma once